commit f6273276443dfea16a8c3500b9cf730b1c2e7393
author Steven Moreland <smoreland@google.com> Fri Oct 13 19:49:09 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 13 19:49:09 2023 +0000
tree 042aafc4b68242cc98c4471af858ec2fc4416c6a
parent 4c9c7f092f7851cf0bdf2cb9de11001f3ca352fd
parent 614cc2438a87e72810feb646a27073be9d4a9ac1

Merge "servicemanager_fuzzer: fix ODR" into main

cmds/servicemanager/Android.bp

diff --git a/cmds/servicemanager/Android.bp b/cmds/servicemanager/Android.bp
index d73a30b..e00c2a2 100644
--- a/cmds/servicemanager/Android.bp
+++ b/cmds/servicemanager/Android.bp
@@ -24,7 +24,6 @@
 
     shared_libs: [
         "libbase",
-        "libbinder", // also contains servicemanager_interface
         "libvintf",
         "libcutils",
         "liblog",
@@ -33,6 +32,21 @@
     ],
 
     target: {
+        android: {
+            shared_libs: [
+                "libbinder",
+                "libutils",
+            ],
+        },
+        host: {
+            static_libs: [
+                "libbinder",
+                "libutils",
+            ],
+        },
+        darwin: {
+            enabled: false,
+        },
         vendor: {
             exclude_shared_libs: ["libvintf"],
         },