diff options
| author | Xusong Wang <xusongw@google.com> | 2019-08-28 13:20:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-28 13:20:33 -0700 |
| commit | ed67e52eb1c78945ccf63848abc3d5f5a71147fb (patch) | |
| tree | b4b56a615a33b161ea18c4f1ca6d95fa9e852f8f /nn/runtime/test/Android.bp | |
| parent | cc23ea2eafbbff5953fd7c18edd8146104fc1537 (diff) | |
| parent | db49c5e748dd5df0a50cdd3fefa12c9d0e09c816 (diff) | |
| download | ml-ed67e52eb1c78945ccf63848abc3d5f5a71147fb.tar.gz | |
Merge changes from topic "nnapi_test_dynamic_reg"
am: db49c5e748
Change-Id: Ifb6ba4c9d908c021c511a714369fc2087526a157
Diffstat (limited to 'nn/runtime/test/Android.bp')
| -rw-r--r-- | nn/runtime/test/Android.bp | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/nn/runtime/test/Android.bp b/nn/runtime/test/Android.bp index c55b6cecb..b27fc29d5 100644 --- a/nn/runtime/test/Android.bp +++ b/nn/runtime/test/Android.bp @@ -55,6 +55,7 @@ cc_defaults { // // Changes to this list must be reflected in the "CtsNNAPITests_static" // library to ensure CTS tests coverage. + "TestAssertions.cpp", "TestFree.cpp", "TestGenerated.cpp", "TestMemory.cpp", @@ -68,7 +69,6 @@ cc_defaults { "TestValidation.cpp", "TestWrapper.cpp", "generated/spec_V1_*/*.example.cpp", - "generated/spec_V1_*/cts/*.test.cpp", ], static_libs: [ "libgmock", @@ -218,7 +218,6 @@ cc_defaults { "TestMain.cpp", "TestNeuralNetworksWrapper.cpp", "generated/spec_V1_*/*.example.cpp", - "generated/spec_V1_*/cts/*.test.cpp", ], cflags: [ "-DNNTEST_MULTITHREADED", @@ -274,7 +273,6 @@ cc_library_static { "fuzzing/TestRandomGraph.cpp", "fuzzing/operation_signatures/*.cpp", "generated/spec_V1_*/*.example.cpp", - "generated/spec_V1_*/cts/*.test.cpp", ], include_dirs: [ "frameworks/ml/nn/common/include", @@ -302,50 +300,23 @@ cc_library_static { } filegroup { - name: "VtsHalNeuralNetworksV1_0_all_generated_V1_0_tests", + name: "VtsHalNeuralNetworksV1_0_all_generated_tests", srcs: [ "generated/spec_V1_0/*.example.cpp", - "generated/spec_V1_0/vts_V1_0/*.test.cpp", ], } filegroup { - name: "VtsHalNeuralNetworksV1_1_all_generated_V1_0_tests", - srcs: [ - "generated/spec_V1_0/*.example.cpp", - "generated/spec_V1_0/vts_V1_1/*.test.cpp", - ], -} - -filegroup { - name: "VtsHalNeuralNetworksV1_1_all_generated_V1_1_tests", - srcs: [ - "generated/spec_V1_1/*.example.cpp", - "generated/spec_V1_1/vts_V1_1/*.test.cpp", - ], -} - -filegroup { - name: "VtsHalNeuralNetworksV1_2_all_generated_V1_0_tests", - srcs: [ - "generated/spec_V1_0/*.example.cpp", - "generated/spec_V1_0/vts_V1_2/*.test.cpp", - ], -} - -filegroup { - name: "VtsHalNeuralNetworksV1_2_all_generated_V1_1_tests", + name: "VtsHalNeuralNetworksV1_1_all_generated_tests", srcs: [ "generated/spec_V1_1/*.example.cpp", - "generated/spec_V1_1/vts_V1_2/*.test.cpp", ], } filegroup { - name: "VtsHalNeuralNetworksV1_2_all_generated_V1_2_tests", + name: "VtsHalNeuralNetworksV1_2_all_generated_tests", srcs: [ "generated/spec_V1_2/*.example.cpp", - "generated/spec_V1_2/vts_V1_2/*.test.cpp", ], } |