From 5d398d542fbdfcb97f4cb1e53470b178dbc0f2f8 Mon Sep 17 00:00:00 2001
From: William Escande <wescande@google.com>
Date: Wed, 28 Feb 2024 17:14:13 -0800
Subject: [PATCH] Remove un-necessary build dependencies

Test: mmm packages/modules/Bluetooth
Flag: Exempt, Build change only
Bug: 327276793
Change-Id: I2f21c24aed68bafc3abca17f25a83ce202209514
---
 android/app/Android.bp                       | 1 -
 system/audio_hal_interface/fuzzer/Android.bp | 1 -
 system/gd/rust/topshim/facade/Android.bp     | 2 --
 system/main/Android.bp                       | 2 +-
 system/stack/Android.bp                      | 2 --
 system/stack/test/fuzzers/Android.bp         | 1 -
 system/test/headless/Android.bp              | 1 -
 7 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/android/app/Android.bp b/android/app/Android.bp
index 248257dc7d8..095fbf03723 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -149,7 +149,6 @@ cc_library_shared {
         "server_configurable_flags",
     ],
     shared_libs: [
-        "libPlatformProperties",
         "libaaudio",
         "libbinder_ndk",
         "libcrypto",
diff --git a/system/audio_hal_interface/fuzzer/Android.bp b/system/audio_hal_interface/fuzzer/Android.bp
index a70a6f72da5..a3c3d4e7678 100644
--- a/system/audio_hal_interface/fuzzer/Android.bp
+++ b/system/audio_hal_interface/fuzzer/Android.bp
@@ -88,7 +88,6 @@ cc_defaults {
         "libcgrouprc",
         "libcgrouprc_format",
         "libchrome",
-        "libcom.android.sysprop.bluetooth.wrapped",
         "libcutils",
         "libevent",
         "libg722codec",
diff --git a/system/gd/rust/topshim/facade/Android.bp b/system/gd/rust/topshim/facade/Android.bp
index 898f7408e77..bdbe1275b49 100644
--- a/system/gd/rust/topshim/facade/Android.bp
+++ b/system/gd/rust/topshim/facade/Android.bp
@@ -72,7 +72,6 @@ rust_defaults {
         "libbtif-core",
         "libc++fs",
         "libchrome",
-        "libcom.android.sysprop.bluetooth.wrapped",
         "libevent",
         "libflatbuffers-cpp",
         "libg722codec",
@@ -82,7 +81,6 @@ rust_defaults {
         "libudrv-uipc",
     ],
     shared_libs: [
-        "libPlatformProperties",
         "libcrypto",
         "libcutils",
         "libgrpc++",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 19596298214..a37f97d4e25 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -149,13 +149,13 @@ cc_library_static {
     ],
     whole_static_libs: [
         "libbluetooth_gd", // Gabeldorsche
-        "libcom.android.sysprop.bluetooth.wrapped",
     ],
     header_libs: ["libbluetooth_headers"],
     static_libs: [
         "libbluetooth_log",
         "libbt-platform-protos-lite",
         "libbt_shim_bridge",
+        "libcom.android.sysprop.bluetooth.wrapped",
     ],
 }
 
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 0f624e3ec67..5840788a161 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -1676,7 +1676,6 @@ cc_test {
         "libosi",
     ],
     shared_libs: [
-        "libPlatformProperties",
         "libcrypto",
     ],
     sanitize: {
@@ -1740,7 +1739,6 @@ cc_test {
         "libprotobuf-cpp-lite",
     ],
     shared_libs: [
-        "libPlatformProperties",
         "libcrypto",
     ],
     target: {
diff --git a/system/stack/test/fuzzers/Android.bp b/system/stack/test/fuzzers/Android.bp
index 3187d1ff573..66e8ee08c7b 100644
--- a/system/stack/test/fuzzers/Android.bp
+++ b/system/stack/test/fuzzers/Android.bp
@@ -60,7 +60,6 @@ cc_defaults {
         "libbte",
         "libbtif",
         "libbtif-core",
-        "libcom.android.sysprop.bluetooth.wrapped",
         "libg722codec",
         "liblc3",
         "libopus",
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index 9d21cb4634e..5903b4b960f 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -113,7 +113,6 @@ cc_binary {
         "libbtif-core",
         "libc++fs",
         "libchrome",
-        "libcom.android.sysprop.bluetooth.wrapped",
         "libevent",
         "libflatbuffers-cpp",
         "libfmq",
-- 
GitLab