Remove libbluetooth_gd from fluoride_defaults

Bug: 279502784
Test: mmm packages/modules/Bluetooth
Change-Id: Iab58fdc3ecddca7bb5e7081f76f9210c2c4acd1e

11 files changed, 40 insertions, 1 deletions

diff --git a/android/app/Android.bp b/android/app/Android.bp
index ae6f315ddd..239d410074 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -100,6 +100,7 @@ cc_library_shared {
         "libbluetooth-types",
         "libbluetooth_core_rs",
         "libbluetooth_core_rs_bridge",
+        "libbluetooth_gd",
         "libbt-audio-hal-interface",
         "libbt-bta",
         "libbt-bta-core",
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 518161945b..0805b45f6e 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -131,6 +131,7 @@ cc_library_static {
     static_libs: [
         "avrcp-target-service",
         "lib-bt-packets",
+        "libbluetooth_gd",
         "libbt-bta-core",
         "libcom.android.sysprop.bluetooth",
     ],
@@ -239,6 +240,7 @@ cc_test {
     static_libs: [
         "crypto_toolbox_for_tests",
         "libbluetooth-types",
+        "libbluetooth_gd",
         "libbt-audio-hal-interface",
         "libbt-bta",
         "libbt-bta-core",
@@ -284,6 +286,7 @@ cc_test {
     static_libs: [
         "crypto_toolbox_for_tests",
         "libbluetooth-types",
+        "libbluetooth_gd",
         "libbt-audio-hal-interface",
         "libbt-bta",
         "libbt-bta-core",
@@ -401,6 +404,7 @@ cc_test {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbluetooth_gd",
         "libbt-common",
         "libbtcore",
         "libbtdevice",
@@ -461,6 +465,7 @@ cc_test {
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libgmock",
@@ -504,6 +509,7 @@ cc_test {
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libgmock",
@@ -558,6 +564,7 @@ cc_test {
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libgmock",
@@ -721,6 +728,7 @@ cc_test {
         "liblog", // __android_log_print
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libevent",
@@ -791,6 +799,7 @@ cc_test {
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
+        "libbluetooth_gd",
         "libbt-audio-hal-interface",
         "libbt-common",
         "libchrome",
@@ -854,6 +863,7 @@ cc_test {
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libgmock",
@@ -906,6 +916,7 @@ cc_test {
         "liblog",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libgmock",
@@ -1029,6 +1040,7 @@ cc_test {
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libgmock",
@@ -1090,6 +1102,7 @@ cc_test {
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libcom.android.sysprop.bluetooth",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index d7e341ed6d..097d66908d 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -345,6 +345,7 @@ cc_test {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbluetooth_gd",
         "libchrome",
         "libosi",
     ],
@@ -413,6 +414,7 @@ cc_test {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libevent",
@@ -595,6 +597,7 @@ cc_test {
         "lib-bt-packets-base",
         "libaudio-a2dp-hw-utils",
         "libbluetooth-types",
+        "libbluetooth_gd",
         "libbt-audio-hal-interface",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
@@ -728,6 +731,7 @@ cc_test {
         "lib-bt-packets-base",
         "libaudio-a2dp-hw-utils",
         "libbluetooth-types",
+        "libbluetooth_gd",
         "libbt-audio-hal-interface",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 76b9b476f3..52a5850179 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -88,7 +88,6 @@ cc_defaults {
         "fluoride_defaults_fuzzable",
     ],
     static_libs: [
-        "libbluetooth_gd",
         "libstatslog_bt",
     ],
     target: {
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 33a04833b0..738db4f73f 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -53,6 +53,7 @@ cc_test {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbluetooth_gd",
         "libbtcore",
         "libbtdevice",
         "libchrome",
diff --git a/system/device/fuzzer/Android.bp b/system/device/fuzzer/Android.bp
index 08aeaa971a..1f5193d948 100644
--- a/system/device/fuzzer/Android.bp
+++ b/system/device/fuzzer/Android.bp
@@ -35,6 +35,7 @@ cc_fuzz {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbluetooth_gd",
         "libbtcore",
         "libbtdevice",
         "libchrome",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 123d749bc0..7db09bbab3 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -57,6 +57,7 @@ cc_library_static {
     ],
     host_supported: true,
     min_sdk_version: "Tiramisu",
+    static_libs: ["libbluetooth_gd"],
 }
 
 cc_library {
@@ -204,6 +205,7 @@ cc_test {
     ],
     static_libs: [
         "libbluetooth-dumpsys",
+        "libbluetooth_gd",
         "libbt-common",
         "libbtdevice",
         "libchrome",
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index f5c6fc8e68..917fe1280a 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -159,6 +159,7 @@ cc_test {
         "test",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libc++fs",
         "libchrome",
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index 8bb0912c73..19c5c1d3de 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -70,6 +70,7 @@ cc_test {
         "lib-bt-packets-avrcp",
         "lib-bt-packets-base",
         "libbase",
+        "libbluetooth_gd",
         "libbtdevice",
         "libchrome",
         "libcutils",
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 894ce03266..197383a7ad 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -292,6 +292,7 @@ cc_library_static {
     ],
     static_libs: [
         "libbluetooth_core_rs",
+        "libbluetooth_gd",
         "libbt-hci",
     ],
     shared_libs: [
@@ -737,6 +738,7 @@ cc_test {
         "libcutils",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libevent",
@@ -813,6 +815,7 @@ cc_test {
         "libcutils",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libchrome",
         "libevent",
         "libgmock",
@@ -879,6 +882,7 @@ cc_test {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libevent",
@@ -927,6 +931,7 @@ cc_test {
         "libcutils",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libevent",
@@ -991,6 +996,7 @@ cc_test {
         "libcutils",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libevent",
@@ -1097,6 +1103,7 @@ cc_test {
     ],
     static_libs: [
         "libFraunhoferAAC",
+        "libbluetooth_gd",
         "libbt-common",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
@@ -1203,6 +1210,7 @@ cc_test {
         "libcutils",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libevent",
@@ -1309,6 +1317,7 @@ cc_test {
         "libcutils",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libevent",
@@ -1422,6 +1431,7 @@ cc_test {
         "test/stack_include_test.cc",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
@@ -1600,6 +1610,7 @@ cc_test {
         "test/stack_btu_test.cc",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libbtdevice",
         "libchrome",
@@ -1680,6 +1691,7 @@ cc_test {
         "test/gatt/stack_gatt_test.cc",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libbtdevice",
         "libchrome",
@@ -1760,6 +1772,7 @@ cc_test {
         "test/stack_l2cap_test.cc",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libbtdevice",
         "libchrome",
@@ -1844,6 +1857,7 @@ cc_test {
         "test/stack_acl_test.cc",
     ],
     static_libs: [
+        "libbluetooth_gd",
         "libbt-common",
         "libbtdevice",
         "libchrome",
@@ -1911,6 +1925,7 @@ cc_test {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbluetooth_gd",
         "libbt-common",
         "libchrome",
         "libgmock",
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 0158173745..57988a356b 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -124,6 +124,7 @@ cc_test {
         "android.hardware.common-V2-ndk",
         "android.hardware.common.fmq-V1-ndk",
         "android.media.audio.common.types-V2-ndk",
+        "libbluetooth_gd",
         "libchrome",
         "libevent",
     ],