diff options
| author | Michael Butler <butlermichael@google.com> | 2019-08-23 16:15:58 -0700 |
|---|---|---|
| committer | Michael Butler <butlermichael@google.com> | 2019-08-28 11:32:28 -0700 |
| commit | 27f57510e31be323569feecd172c31034b22628e (patch) | |
| tree | 2aee543afececf4662bd24166a7adac076c4a304 /nn/runtime/test/Android.bp | |
| parent | db49c5e748dd5df0a50cdd3fefa12c9d0e09c816 (diff) | |
| download | ml-27f57510e31be323569feecd172c31034b22628e.tar.gz | |
Build common test component as static library
Bug: 139889855
Test: mma
Test: NeuralNetworksTest_static
Test: CtsNNAPITestCases
Test: VtsHalNeuralnetworksV1_*TargetTest (with sample-all)
Test: VtsHalNeuralnetworksV1_*CompatV1_*TargetTest (with sample-all)
Change-Id: I7847d427af78d402010c2893139544a1d7f6b195
Merged-In: I7847d427af78d402010c2893139544a1d7f6b195
(cherry picked from commit 98488c8fdc5d6b6d77122fc059c840e564595c71)
Diffstat (limited to 'nn/runtime/test/Android.bp')
| -rw-r--r-- | nn/runtime/test/Android.bp | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/nn/runtime/test/Android.bp b/nn/runtime/test/Android.bp index 02d114148..e138f11dd 100644 --- a/nn/runtime/test/Android.bp +++ b/nn/runtime/test/Android.bp @@ -68,11 +68,15 @@ cc_defaults { "TestValidateOperations.cpp", "TestValidation.cpp", "TestWrapper.cpp", - "generated/spec_V1_*/*.example.cpp", ], static_libs: [ "libgmock", ], + whole_static_libs: [ + "neuralnetworks_generated_V1_0_example", + "neuralnetworks_generated_V1_1_example", + "neuralnetworks_generated_V1_2_example", + ], cflags: [ "-UNDEBUG", ], @@ -194,7 +198,6 @@ cc_defaults { "TestGenerated.cpp", "TestMain.cpp", "TestNeuralNetworksWrapper.cpp", - "generated/spec_V1_*/*.example.cpp", ], cflags: [ "-DNNTEST_MULTITHREADED", @@ -205,6 +208,11 @@ cc_defaults { "libneuralnetworks", "libneuralnetworks_common", ], + whole_static_libs: [ + "neuralnetworks_generated_V1_0_example", + "neuralnetworks_generated_V1_1_example", + "neuralnetworks_generated_V1_2_example", + ], shared_libs: [ "libcutils", ], @@ -276,25 +284,22 @@ cc_library_static { stl: "c++_static", } -filegroup { - name: "VtsHalNeuralNetworksV1_0_all_generated_tests", - srcs: [ - "generated/spec_V1_0/*.example.cpp", - ], +cc_library_static { + name: "neuralnetworks_generated_V1_0_example", + srcs: ["generated/spec_V1_0/*.example.cpp"], + static_libs: ["libneuralnetworks_generated_test_harness"], } -filegroup { - name: "VtsHalNeuralNetworksV1_1_all_generated_tests", - srcs: [ - "generated/spec_V1_1/*.example.cpp", - ], +cc_library_static { + name: "neuralnetworks_generated_V1_1_example", + srcs: ["generated/spec_V1_1/*.example.cpp"], + static_libs: ["libneuralnetworks_generated_test_harness"], } -filegroup { - name: "VtsHalNeuralNetworksV1_2_all_generated_tests", - srcs: [ - "generated/spec_V1_2/*.example.cpp", - ], +cc_library_static { + name: "neuralnetworks_generated_V1_2_example", + srcs: ["generated/spec_V1_2/*.example.cpp"], + static_libs: ["libneuralnetworks_generated_test_harness"], } // CompilationCachingTests in VtsHalNeuralnetworksV1_2TargetTest depend on MobileNets. |