commit 250f176013df9f18d991fc1ec4baea47a29d3dfa
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 18 03:50:47 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jul 18 03:50:47 2024 +0000
tree 45f3513487c357a5a9be2b755c5ab56f948caff7
parent c6a9ae93b4d81f7f93a063d28c2fb3aaeb0511d4
parent 09c1cfea06e682ee1e8f6e0c2f80c3885a97eff6

Merge cherrypicks of ['android-review.googlesource.com/3177740'] into 24Q3-release.

Change-Id: I9f8a641105d9d74ea93c9886c5153d8286f34861

Android.bp

diff --git a/Android.bp b/Android.bp
index fc6babe..e437231 100644
--- a/Android.bp
+++ b/Android.bp
@@ -51,6 +51,7 @@
     // Lists all dependencies that can *not* be expected on the device.
     static_libs: [
         "VtsHalHidlTestUtils",
+        "libhidlbase",
         "libhidl-gen-utils",
     ],
 
@@ -72,6 +73,14 @@
         "-g",
     ],
 
+    target: {
+        android: {
+            shared_libs: [
+                "libvndksupport",
+            ],
+        },
+    },
+
     require_root: true,
 }