From 4e4268156eb67b008b67a3dfca3c61408c877ed9 Mon Sep 17 00:00:00 2001
From: David Duarte <licorne@google.com>
Date: Thu, 1 Jun 2023 13:17:36 +0000
Subject: [PATCH] Remove libutils from fluoride_defaults
Test: mma
Bug: 279502784
Change-Id: Ife78708849bebb063922c80716c9750cd52456cd
---
android/app/Android.bp | 1 +
system/audio_hal_interface/Android.bp | 1 +
system/btif/Android.bp | 3 +++
system/build/Android.bp | 1 -
4 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/android/app/Android.bp b/android/app/Android.bp
index a09f45af53e..f5c826f4076 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -114,6 +114,7 @@ cc_library_shared {
"libcrypto",
"libfmq",
"libnativehelper",
+ "libutils",
],
sanitize: {
scs: true,
diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index 994db05fd69..208cf2eadfa 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -24,6 +24,7 @@ cc_library_static {
"android.hardware.bluetooth.audio@2.0",
"android.hardware.bluetooth.audio@2.1",
"libhidlbase",
+ "libutils",
],
static_libs: [
"libbt-common",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 918793a1fae..3b4a003c968 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -264,6 +264,7 @@ cc_test {
"libcrypto",
"libfmq",
"libhidlbase",
+ "libutils",
],
static_libs: [
"android.hardware.audio.common-V1-ndk",
@@ -573,6 +574,7 @@ cc_test {
"libcutils",
"libhidlbase",
"liblog",
+ "libutils",
],
static_libs: [
"android.hardware.bluetooth.a2dp@1.0",
@@ -705,6 +707,7 @@ cc_test {
"libcutils",
"libhidlbase",
"liblog",
+ "libutils",
],
static_libs: [
"android.hardware.bluetooth.a2dp@1.0",
diff --git a/system/build/Android.bp b/system/build/Android.bp
index d78ceb070bc..3f43c467a61 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -133,7 +133,6 @@ cc_defaults {
shared_libs: [
"libcutils",
"libhidlbase",
- "libutils",
],
target: {
darwin: {
--
GitLab