commit 6b7710c3ab7c04703fe1621fb8b1b24e97b16556
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 01 04:10:55 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 01 04:10:55 2021 +0000
tree 992dd0e56b7bb2e44fda74a5dcc2940b7874bbac
parent 3aeebcf74e2409e22dd59edc393a5db90f2d28f6
parent 69d31f9bd3205d55c314742f057b2969e76e2243

Merge changes I7a307698,Id11e1b95

* changes:
  [binder_rpc_fuzzer] Depend on shared libutils for the device
  [cmd_fuzzer] Depend on libutils.so instead of libutils.a

cmds/cmd/fuzzer/Android.bp

diff --git a/cmds/cmd/fuzzer/Android.bp b/cmds/cmd/fuzzer/Android.bp
index 8262bc2..a65f6de 100644
--- a/cmds/cmd/fuzzer/Android.bp
+++ b/cmds/cmd/fuzzer/Android.bp
@@ -30,12 +30,12 @@
     ],
     static_libs: [
         "libcmd",
-        "libutils",
         "liblog",
         "libselinux",
     ],
     shared_libs: [
         "libbinder",
+        "libutils",
     ],
     fuzz_config: {
         cc: [

libs/binder/tests/rpc_fuzzer/Android.bp

diff --git a/libs/binder/tests/rpc_fuzzer/Android.bp b/libs/binder/tests/rpc_fuzzer/Android.bp
index 1c75306..9323bd5 100644
--- a/libs/binder/tests/rpc_fuzzer/Android.bp
+++ b/libs/binder/tests/rpc_fuzzer/Android.bp
@@ -22,18 +22,19 @@
         "libbase",
         "libcutils",
         "liblog",
-        "libutils",
     ],
 
     target: {
         android: {
             shared_libs: [
                 "libbinder",
+                "libutils",
             ],
         },
         host: {
             static_libs: [
                 "libbinder",
+                "libutils",
             ],
         },
     },