From 1c83cff859f99f988182c75597d028f55ae64a50 Mon Sep 17 00:00:00 2001
From: David Duarte <licorne@google.com>
Date: Wed, 31 May 2023 14:56:02 +0000
Subject: [PATCH] Remove libaaudio from fluoride_basic_defaults

Test: mma
Bug: 279502784
Change-Id: I30802a51010305b17ad0d2321753fea76edeae5a
---
 android/app/Android.bp  | 1 +
 system/btif/Android.bp  | 2 ++
 system/build/Android.bp | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/android/app/Android.bp b/android/app/Android.bp
index a93b4eee6fd..7b98878785b 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -108,6 +108,7 @@ cc_library_shared {
         "android.hardware.bluetooth@1.0",
         "android.hardware.bluetooth@1.1",
         "android.system.suspend-V1-ndk",
+        "libaaudio",
         "libbinder_ndk",
         "libfmq",
         "libnativehelper",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 8ca41c8dc19..802c80b1579 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -136,6 +136,7 @@ cc_library_static {
                 "libPlatformProperties",
             ],
             srcs: ["src/btif_avrcp_audio_track.cc"],
+            shared_libs: ["libaaudio"],
         },
         host: {
             srcs: [
@@ -210,6 +211,7 @@ cc_library_static {
     target: {
         android: {
             srcs: ["src/btif_avrcp_audio_track.cc"],
+            shared_libs: ["libaaudio"],
         },
         host: {
             srcs: [
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 62a3791a747..56b5fbb9af3 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -130,7 +130,6 @@ cc_defaults {
         android: {
             shared_libs: [
                 "libPlatformProperties",
-                "libaaudio",
             ],
         },
     },
-- 
GitLab