commit 11436ad042b8aeffe71509d43a9e4879dc76c43a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 01 05:05:27 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 01 05:05:27 2021 +0000
tree e50e43894f81640053601315f0381152066f1d18
parent 5f8970b4bc08e2d2727f278fd472375a7d82ad63
parent ac5ebf6e10bf8342f39ab34506bf8ee1af7677c8

Merge changes I7a307698,Id11e1b95 am: 6b7710c3ab am: 466ca7afd9 am: 7a490ba293 am: ac5ebf6e10

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

Change-Id: I039db4d48918658768ac9a924fb5e15aad09e922

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