commit 64f9eb4bd5cbc9bf8e3feff3618ca7681fb8b401
author Lev Proleev <levp@google.com> Thu Oct 10 13:54:38 2019 +0000
committer Lev Proleev <levp@google.com> Thu Oct 10 13:54:38 2019 +0000
tree ef505a75d7b5e37851f22454dde9acaf20cddd87
parent 543606fb92143dea42c83cb1d08c559957772178

Revert "Modify NNAPI VTS tests to run on version 1.3"

This reverts commit 543606fb92143dea42c83cb1d08c559957772178.

Reason for revert: the topic breaks git_qt-dev-plus-aosp

Change-Id: I74859bae687d65d344ed7edc617e1a7d086960a1

neuralnetworks/1.2/vts/functional/Android.bp

diff --git a/neuralnetworks/1.2/vts/functional/Android.bp b/neuralnetworks/1.2/vts/functional/Android.bp
index fc727b7..bfb8719 100644
--- a/neuralnetworks/1.2/vts/functional/Android.bp
+++ b/neuralnetworks/1.2/vts/functional/Android.bp
@@ -14,28 +14,12 @@
 // limitations under the License.
 //
 
-cc_library_static {
-    name: "VtsHalNeuralNetworksV1_2Callbacks",
-    defaults: ["VtsHalTargetTestDefaults"],
-    export_include_dirs: ["include"],
-    srcs: [
-        "Callbacks.cpp",
-    ],
-    static_libs: [
-        "android.hardware.neuralnetworks@1.0",
-        "android.hardware.neuralnetworks@1.1",
-        "android.hardware.neuralnetworks@1.2",
-    ],
-    header_libs: [
-        "libbase_headers",
-    ]
-}
-
 cc_test {
     name: "VtsHalNeuralnetworksV1_2TargetTest",
     defaults: ["VtsHalTargetTestDefaults"],
     srcs: [
         "BasicTests.cpp",
+        "Callbacks.cpp",
         "CompilationCachingTests.cpp",
         "GeneratedTestHarness.cpp",
         "TestAssertions.cpp",
@@ -61,7 +45,6 @@
         "libneuralnetworks_generated_test_harness",
         "libneuralnetworks_utils",
         "VtsHalNeuralNetworksV1_0_utils",
-        "VtsHalNeuralNetworksV1_2Callbacks",
     ],
     whole_static_libs: [
         "neuralnetworks_generated_V1_0_example",