commit 7b1f517d16d2f55d03b8771e584c5a04f7ea501c
author Pirama Arumuga Nainar <pirama@google.com> Mon Apr 11 20:44:02 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Apr 11 20:44:02 2022 +0000
tree ec974cccb114355becc65c316cb8a7effa5db51c
parent d4e225d2625fb3c4f58ad8ed6c5ef3ce53726ac1
parent cf3068a095986ce18eea4e9602d790b187b5766f

Merge "Build with upstream lld: Fix incorrect static dependencies" am: f6ab9183b7 am: c136d4386c am: f64db81395 am: 872e4e5206 am: cf3068a095

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2058987

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

media/libstagefright/httplive/fuzzer/Android.bp

diff --git a/media/libstagefright/httplive/fuzzer/Android.bp b/media/libstagefright/httplive/fuzzer/Android.bp
index 14097b0..85fd8b7 100644
--- a/media/libstagefright/httplive/fuzzer/Android.bp
+++ b/media/libstagefright/httplive/fuzzer/Android.bp
@@ -40,7 +40,6 @@
         "libdatasource",
         "libmedia",
         "libstagefright",
-        "libutils",
     ],
     header_libs: [
         "libbase_headers",
@@ -53,6 +52,7 @@
         "libstagefright_foundation",
         "libhidlbase",
         "libhidlmemory",
+        "libutils",
         "android.hidl.allocator@1.0",
     ],
     corpus: ["corpus/*"],

services/tuner/Android.bp

diff --git a/services/tuner/Android.bp b/services/tuner/Android.bp
index ec62d4e..5c1dda1 100644
--- a/services/tuner/Android.bp
+++ b/services/tuner/Android.bp
@@ -92,11 +92,8 @@
         "liblog",
         "libtunerservice",
         "libutils",
-        "tv_tuner_resource_manager_aidl_interface-ndk",
-    ],
-
-    static_libs: [
         "tv_tuner_aidl_interface-ndk",
+        "tv_tuner_resource_manager_aidl_interface-ndk",
     ],
 
     init_rc: ["mediatuner.rc"],