commit c42a934ea8b7869afc7b877f1efb6bc30f21c49b
author Michael Butler <butlermichael@google.com> Tue Oct 26 03:29:13 2021 +0000
committer Michael Butler <butlermichael@google.com> Mon Oct 25 21:13:15 2021 -0700
tree 27d24897c0611d9315aa902f037c5c606c9d7a76
parent cb2c37f78f4a54c79d8a60f8e754ef0d3cfc637d

Revert "Provide explicitly versioned NNAPI AIDL utils libs -- HAL."

Revert "Use explicitly versioned NNAPI HAL util libs in darwinn2."

Revert "Add neuralnetworks_utils_hal_aidl_v2 to allowed_deps.txt"

Revert "Provide explicitly version NNAPI AIDL utils lib -- runtime."

Revert submission 16007539-nnapi-experimental-aidl-feature

Reason for revert: The cherry-pick of this CL breaks the build
Reverted Changes:
Ieb2da3461:Add neuralnetworks_utils_hal_aidl_v2 to allowed_de...
I8ae01e3c6:Provide explicitly version NNAPI AIDL utils lib --...
I74f1798e8:Provide explicitly versioned NNAPI AIDL utils libs...
I2362464e8:Use explicitly versioned NNAPI HAL util libs in da...

Test: mma

Change-Id: I3d3ac4745fb707cbdceb2019f3c2fc7807183b71
Merged-In: I3d3ac4745fb707cbdceb2019f3c2fc7807183b71
(cherry picked from commit 932e82b0c30fa2078bd421053506ec4e9191f66c)

neuralnetworks/aidl/vts/functional/Android.bp

diff --git a/neuralnetworks/aidl/vts/functional/Android.bp b/neuralnetworks/aidl/vts/functional/Android.bp
index a09cdab..4dc2ed0 100644
--- a/neuralnetworks/aidl/vts/functional/Android.bp
+++ b/neuralnetworks/aidl/vts/functional/Android.bp
@@ -26,7 +26,6 @@
 cc_test {
     name: "VtsHalNeuralnetworksTargetTest",
     defaults: [
-        "neuralnetworks_use_latest_utils_hal_aidl",
         "neuralnetworks_vts_functional_defaults",
         "use_libaidlvintf_gtest_helper_static",
     ],
@@ -52,14 +51,16 @@
     static_libs: [
         "android.hardware.common-V2-ndk",
         "android.hardware.graphics.common-V2-ndk",
+        "android.hardware.neuralnetworks-V2-ndk",
         "android.hidl.allocator@1.0",
         "android.hidl.memory@1.0",
         "libaidlcommonsupport",
         "libgmock",
         "libhidlmemory",
-        "libneuralnetworks_common",
         "libneuralnetworks_generated_test_harness",
+        "libneuralnetworks_utils",
         "libsync",
+        "neuralnetworks_utils_hal_aidl",
     ],
     whole_static_libs: [
         "neuralnetworks_generated_V1_0_example",