commit 4021836b0fb933e5116bdbc757e09e91d744f7c2
author Devin Moore <devinmoore@google.com> Wed Sep 04 15:35:47 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 04 15:35:47 2024 +0000
tree 3d2a24e128083a9d8c55e2ff91d74b74e89ed6b2
parent 7a3762cbdd30be96ddec2407e826a47c8e69642d
parent eb39ea1855023c268b12c226699a0351e101c8b2

Merge "Revert "CameraVTS: build with static libhidlbase"" into main am: eb39ea1855

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3252935

Change-Id: I03e31ce7e0b8d2fbf476929b2e07016cae8ca7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 223a1a9..baf3291 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,7 +51,6 @@
     // Lists all dependencies that can *not* be expected on the device.
     static_libs: [
         "VtsHalHidlTestUtils",
-        "libhidlbase",
         "libhidl-gen-utils",
     ],
 
@@ -64,6 +63,7 @@
         "libbase",
         // All the following are dependencies of any HAL definition library.
         "libcutils",
+        "libhidlbase",
         "liblog",
         "libutils",
     ],
@@ -72,14 +72,6 @@
         "-g",
     ],
 
-    target: {
-        android: {
-            shared_libs: [
-                "libvndksupport",
-            ],
-        },
-    },
-
     require_root: true,
 }