commit 932e82b0c30fa2078bd421053506ec4e9191f66c
author Michael Butler <butlermichael@google.com> Tue Oct 26 03:29:13 2021 +0000
committer Michael Butler <butlermichael@google.com> Tue Oct 26 03:29:13 2021 +0000
tree 647a4ea50b4109b40a61123d615fd80d93691414
parent 9763a9537df323c5d4446483d1375057582c6228

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...

Change-Id: I3d3ac4745fb707cbdceb2019f3c2fc7807183b71

neuralnetworks/aidl/utils/Android.bp

diff --git a/neuralnetworks/aidl/utils/Android.bp b/neuralnetworks/aidl/utils/Android.bp
index 2c2419b..63cf45d 100644
--- a/neuralnetworks/aidl/utils/Android.bp
+++ b/neuralnetworks/aidl/utils/Android.bp
@@ -23,8 +23,8 @@
     default_applicable_licenses: ["hardware_interfaces_license"],
 }
 
-cc_defaults {
-    name: "neuralnetworks_utils_hal_aidl_defaults",
+cc_library_static {
+    name: "neuralnetworks_utils_hal_aidl",
     defaults: ["neuralnetworks_utils_defaults"],
     srcs: ["src/*"],
     local_include_dirs: ["include/nnapi/hal/aidl/"],
@@ -38,6 +38,7 @@
         "neuralnetworks_utils_hal_common",
     ],
     shared_libs: [
+        "android.hardware.neuralnetworks-V2-ndk",
         "libbinder_ndk",
         "libhidlbase",
     ],
@@ -48,49 +49,21 @@
     },
 }
 
-cc_library_static {
-    name: "neuralnetworks_utils_hal_aidl_v1",
-    defaults: ["neuralnetworks_utils_hal_aidl_defaults"],
-    shared_libs: [
-        "android.hardware.neuralnetworks-V1-ndk",
-    ],
-}
-
-cc_library_static {
-    name: "neuralnetworks_utils_hal_aidl_v2",
-    defaults: ["neuralnetworks_utils_hal_aidl_defaults"],
-    shared_libs: [
-        "android.hardware.neuralnetworks-V2-ndk",
-    ],
-}
-
-// A cc_defaults that includes the latest non-experimental AIDL utilities and other AIDL libraries
-// that are commonly used together. Modules that always depend on the latest non-experimental
-// AIDL features can include this cc_defaults to avoid managing dependency versions explicitly.
-cc_defaults {
-    name: "neuralnetworks_use_latest_utils_hal_aidl",
-    static_libs: [
-        "android.hardware.common-V2-ndk",
-        "android.hardware.graphics.common-V3-ndk",
-        "android.hardware.neuralnetworks-V2-ndk",
-        "neuralnetworks_utils_hal_aidl_v2",
-    ],
-}
-
 cc_test {
     name: "neuralnetworks_utils_hal_aidl_test",
-    defaults: [
-        "neuralnetworks_use_latest_utils_hal_aidl",
-        "neuralnetworks_utils_defaults",
-    ],
+    defaults: ["neuralnetworks_utils_defaults"],
     srcs: [
         "test/*.cpp",
     ],
     static_libs: [
+        "android.hardware.common-V2-ndk",
+        "android.hardware.graphics.common-V3-ndk",
+        "android.hardware.neuralnetworks-V2-ndk",
         "libaidlcommonsupport",
         "libgmock",
         "libneuralnetworks_common",
         "neuralnetworks_types",
+        "neuralnetworks_utils_hal_aidl",
         "neuralnetworks_utils_hal_common",
     ],
     shared_libs: [