commit 6a2c85cf085cb0c14b80af72ab82139e38d343e4
author Steven Moreland <smoreland@google.com> Fri Oct 13 21:25:30 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 13 21:25:30 2023 +0000
tree 0d94437202393f029aa4f0746865becf3c00dc16
parent 2d902bc2f51fb5d1542d39010b5dbf9cb0f7d3e9
parent fd193e871da2559695a2b51b622434a1a24f1bea

Merge "servicemanager_fuzzer: fix ODR" into main am: f627327644 am: 4479431fba am: fd193e871d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2787220

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

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"],
         },