From f01a55241cca0db32acc115228ea64a0d454e799 Mon Sep 17 00:00:00 2001
From: David Duarte <licorne@google.com>
Date: Fri, 1 Sep 2023 18:57:08 +0000
Subject: [PATCH] Remove divergences in soong files from AOSP main
Bug: 298680973
Test: mmm packages/modules/Bluetooth
Change-Id: Iccb65bc4ede79b656b5b17d3596d99744c168861
Merged-In: Iccb65bc4ede79b656b5b17d3596d99744c168861
---
system/btif/Android.bp | 6 +++---
system/test/headless/Android.bp | 2 +-
system/test/suite/Android.bp | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 6ad64c249db..0a70ed12f27 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -129,6 +129,9 @@ cc_library_static {
],
target: {
android: {
+ whole_static_libs: [
+ "libPlatformProperties",
+ ],
srcs: ["src/btif_avrcp_audio_track.cc"],
shared_libs: ["libaaudio"],
},
@@ -211,9 +214,6 @@ cc_library_static {
],
target: {
android: {
- whole_static_libs: [
- "libPlatformProperties",
- ],
srcs: ["src/btif_avrcp_audio_track.cc"],
shared_libs: ["libaaudio"],
},
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index daceab8e65b..df60cebe721 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -115,6 +115,7 @@ cc_binary {
"android.hardware.bluetooth@1.0",
"android.hardware.bluetooth@1.1",
"android.system.suspend-V1-ndk",
+ "libPlatformProperties",
"libaaudio",
"libbase",
"libbinder_ndk",
@@ -126,7 +127,6 @@ cc_binary {
"liblog", // __android_log_print
"libstatssocket",
"libutils",
- "libPlatformProperties",
],
header_libs: ["libbluetooth_headers"],
}
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 27f9edc2eeb..c4d6195b83a 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -50,6 +50,7 @@ cc_defaults {
"android.hardware.bluetooth.audio@2.0",
"android.hardware.bluetooth.audio@2.1",
"android.system.suspend-V1-ndk",
+ "libPlatformProperties",
"libbinder",
"libbinder_ndk",
"libcrypto",
@@ -58,7 +59,6 @@ cc_defaults {
"liblog",
"libstatssocket",
"libutils",
- "libPlatformProperties",
],
static_libs: [
"android.hardware.bluetooth.a2dp@1.0",
--
GitLab