Change NNAPI VTS to use static library am: 01ba094edb am: ba2da6c2d3

am: 41b38ee6d0

Change-Id: I59647f50d647bf90c55fcc27bcc27720a6753b87
This commit is contained in:
Michael Butler 2019-08-28 17:21:09 -07:00 committed by android-build-merger
commit b6a206b411
3 changed files with 28 additions and 10 deletions

View file

@ -75,7 +75,9 @@ cc_test {
defaults: ["VtsHalNeuralNetworksV1_0TargetTestDefaults"],
srcs: [
"BasicTests.cpp",
":VtsHalNeuralNetworksV1_0_all_generated_tests",
],
whole_static_libs: [
"neuralnetworks_generated_V1_0_example",
],
}
@ -84,7 +86,9 @@ cc_test {
defaults: ["VtsHalNeuralNetworksV1_0TargetTestDefaults"],
srcs: [
"BasicTests.cpp",
":VtsHalNeuralNetworksV1_0_all_generated_tests",
],
whole_static_libs: [
"neuralnetworks_generated_V1_0_example",
],
cflags: [
"-DPRESUBMIT_NOT_VTS",

View file

@ -49,8 +49,8 @@ cc_defaults {
cc_test {
name: "VtsHalNeuralnetworksV1_1CompatV1_0TargetTest",
defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],
srcs: [
":VtsHalNeuralNetworksV1_0_all_generated_tests",
whole_static_libs: [
"neuralnetworks_generated_V1_0_example",
],
}
@ -60,7 +60,9 @@ cc_test {
defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],
srcs: [
"BasicTests.cpp",
":VtsHalNeuralNetworksV1_1_all_generated_tests",
],
whole_static_libs: [
"neuralnetworks_generated_V1_1_example",
],
}
@ -69,7 +71,9 @@ cc_test {
defaults: ["VtsHalNeuralNetworksV1_1TargetTestDefaults"],
srcs: [
"BasicTests.cpp",
":VtsHalNeuralNetworksV1_1_all_generated_tests",
],
whole_static_libs: [
"neuralnetworks_generated_V1_1_example",
],
cflags: [
"-DPRESUBMIT_NOT_VTS",

View file

@ -53,9 +53,11 @@ cc_test {
name: "VtsHalNeuralnetworksV1_2CompatV1_0TargetTest",
defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],
srcs: [
":VtsHalNeuralNetworksV1_0_all_generated_tests",
"ValidateBurst.cpp",
],
whole_static_libs: [
"neuralnetworks_generated_V1_0_example",
],
}
// Tests for V1_1 models using the V1_2 HAL.
@ -63,9 +65,11 @@ cc_test {
name: "VtsHalNeuralnetworksV1_2CompatV1_1TargetTest",
defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],
srcs: [
":VtsHalNeuralNetworksV1_1_all_generated_tests",
"ValidateBurst.cpp",
],
whole_static_libs: [
"neuralnetworks_generated_V1_1_example",
],
}
// Tests for V1_2 models.
@ -74,11 +78,13 @@ cc_test {
defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],
srcs: [
"BasicTests.cpp",
":VtsHalNeuralNetworksV1_2_all_generated_tests",
":VtsHalNeuralNetworksV1_2_mobilenets",
"CompilationCachingTests.cpp",
"ValidateBurst.cpp",
],
whole_static_libs: [
"neuralnetworks_generated_V1_2_example",
],
}
cc_test {
@ -86,9 +92,13 @@ cc_test {
defaults: ["VtsHalNeuralNetworksV1_2TargetTestDefaults"],
srcs: [
"BasicTests.cpp",
":VtsHalNeuralNetworksV1_2_all_generated_tests",
":VtsHalNeuralNetworksV1_2_mobilenets",
"CompilationCachingTests.cpp",
"ValidateBurst.cpp",
],
whole_static_libs: [
"neuralnetworks_generated_V1_2_example",
],
cflags: [
"-DPRESUBMIT_NOT_VTS",
],