Remove libbt-platform-protos-lite from fluoride_defaults

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

system/bta/Android.bp

@@ -132,6 +132,7 @@ cc_library_static {
         "lib-bt-packets",
         "libbluetooth_gd",
         "libbt-bta-core",
+        "libbt-platform-protos-lite",
         "libcom.android.sysprop.bluetooth",
     ],
     shared_libs: [
@@ -190,6 +191,7 @@ cc_library_static {
     ],
     static_libs: [
         "lib-bt-packets",
+        "libbt-platform-protos-lite",
         "libcom.android.sysprop.bluetooth",
     ],
     apex_available: [
@@ -244,6 +246,7 @@ cc_test {
         "libbt-bta",
         "libbt-bta-core",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libbtcore",
         "libchrome",
         "libcom.android.sysprop.bluetooth",
@@ -290,6 +293,7 @@ cc_test {
         "libbt-bta",
         "libbt-bta-core",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libbtcore",
         "libchrome",
         "libosi",
@@ -406,6 +410,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libbtcore",
         "libbtdevice",
         "libchrome",
@@ -569,6 +574,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libchrome",
         "libgmock",
         "libosi",
@@ -883,6 +889,7 @@ cc_test {
         "libbluetooth_gd",
         "libbt-audio-hal-interface",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libchrome",
         "libevent",
         "libflatbuffers-cpp",
@@ -1189,6 +1196,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libchrome",
         "libcom.android.sysprop.bluetooth",
         "libevent",

system/btif/Android.bp

@@ -150,6 +150,7 @@ cc_library_static {
         "libaudio-a2dp-hw-utils",
         "libbluetooth-types",
         "libbt-audio-hal-interface",
+        "libbt-platform-protos-lite",
         "libbt-stack",
         "libbt-stack-core",
         "libbtif-core",
@@ -227,6 +228,7 @@ cc_library_static {
         "lib-bt-packets-base",
         "libaudio-a2dp-hw-utils",
         "libbt-audio-hal-interface",
+        "libbt-platform-protos-lite",
         "libbt-stack-core",
         "libstatslog_bt",
     ],
@@ -418,6 +420,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libchrome",
         "libevent",
     ],
@@ -599,6 +602,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-audio-hal-interface",
+        "libbt-platform-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libbt-stack",
@@ -733,6 +737,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-audio-hal-interface",
+        "libbt-platform-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libbtdevice",

system/build/Android.bp

@@ -33,7 +33,6 @@ cc_defaults {
     },
     defaults: ["fluoride_types_defaults_fuzzable"],
     static_libs: [
-        "libbt-platform-protos-lite",
         "libbt_shim_bridge",
         "libbt_shim_ffi",
     ],

system/common/Android.bp

@@ -53,6 +53,7 @@ cc_library_static {
     ],
     min_sdk_version: "Tiramisu",
     header_libs: ["libbluetooth_headers"],
+    static_libs: ["libbt-platform-protos-lite"],
 }
 
 cc_test {
@@ -97,6 +98,7 @@ cc_test {
     static_libs: [
         "libbluetooth-types",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libchrome",
         "libevent",
         "libgmock",

system/device/Android.bp

@@ -89,6 +89,7 @@ cc_test {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbt-platform-protos-lite",
         "libbtcore",
         "libbtdevice",
         "libchrome",

system/main/Android.bp

@@ -55,7 +55,10 @@ cc_library_static {
     ],
     host_supported: true,
     min_sdk_version: "Tiramisu",
-    static_libs: ["libbluetooth_gd"],
+    static_libs: [
+        "libbluetooth_gd",
+        "libbt-platform-protos-lite",
+    ],
     header_libs: ["libbluetooth_headers"],
 }
 
@@ -149,6 +152,7 @@ cc_library_static {
         "libbluetooth_gd", // Gabeldorsche
     ],
     header_libs: ["libbluetooth_headers"],
+    static_libs: ["libbt-platform-protos-lite"],
 }
 
 cc_test {
@@ -207,6 +211,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libbtdevice",
         "libchrome",
         "libevent",

system/osi/Android.bp

@@ -88,6 +88,7 @@ cc_library_static {
         "com.android.btservices",
     ],
     header_libs: ["libbluetooth_headers"],
+    static_libs: ["libbt-platform-protos-lite"],
 }
 
 // libosi unit tests for target and host

system/stack/Android.bp

@@ -137,6 +137,7 @@ cc_library_static {
     ],
     static_libs: [
         "libbt-hci",
+        "libbt-platform-protos-lite",
         "libbt-stack-core",
     ],
     whole_static_libs: [
@@ -289,6 +290,7 @@ cc_library_static {
         "libbluetooth_core_rs",
         "libbluetooth_gd",
         "libbt-hci",
+        "libbt-platform-protos-lite",
     ],
     shared_libs: [
         "libPlatformProperties",
@@ -392,7 +394,10 @@ cc_fuzz {
         ":TestMockStackMetrics",
         "fuzzers/sdp_fuzzer.cc",
     ],
-    static_libs: ["libbluetooth-types"],
+    static_libs: [
+        "libbluetooth-types",
+        "libbt-platform-protos-lite",
+    ],
 }
 
 cc_fuzz {
@@ -434,6 +439,7 @@ cc_fuzz {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbt-platform-protos-lite",
         "libgmock",
     ],
 }
@@ -472,6 +478,7 @@ cc_fuzz {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbt-platform-protos-lite",
         "libgmock",
     ],
 }
@@ -510,6 +517,7 @@ cc_fuzz {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbt-platform-protos-lite",
         "libgmock",
     ],
 }
@@ -550,6 +558,7 @@ cc_fuzz {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbt-platform-protos-lite",
         "libgmock",
         "libosi",
     ],
@@ -595,6 +604,7 @@ cc_fuzz {
     ],
     static_libs: [
         "libbluetooth-types",
+        "libbt-platform-protos-lite",
         "libgmock",
     ],
     target: {
@@ -745,6 +755,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libchrome",
         "libevent",
         "libgmock",
@@ -824,6 +835,7 @@ cc_test {
     static_libs: [
         "libbluetooth-types",
         "libbluetooth_gd",
+        "libbt-platform-protos-lite",
         "libchrome",
         "libevent",
         "libgmock",
@@ -1228,6 +1240,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libchrome",
         "libevent",
         "libgmock",
@@ -1457,6 +1470,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libbtdevice",
@@ -1565,6 +1579,7 @@ cc_test {
     static_libs: [
         "libbluetooth-types",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libbtdevice",
         "libbte",
         "libchrome",
@@ -1639,6 +1654,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libbtdevice",
         "libchrome",
         "libevent",
@@ -1722,6 +1738,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libbtdevice",
         "libchrome",
         "libevent",
@@ -1806,6 +1823,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libbtdevice",
         "libchrome",
         "libevent",
@@ -1894,6 +1912,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libbtdevice",
         "libchrome",
         "libevent",
@@ -1964,6 +1983,7 @@ cc_test {
         "libbluetooth-types",
         "libbluetooth_gd",
         "libbt-common",
+        "libbt-platform-protos-lite",
         "libchrome",
         "libgmock",
         "liblog",

system/test/suite/Android.bp

@@ -124,6 +124,7 @@ cc_test {
         "android.hardware.common.fmq-V1-ndk",
         "android.media.audio.common.types-V2-ndk",
         "libbluetooth_gd",
+        "libbt-platform-protos-lite",
         "libchrome",
         "libevent",
     ],