Remove libstatslog_bt from fluoride_defaults

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

android/app/Android.bp

@@ -128,6 +128,7 @@ cc_library_shared {
         "libopus",
         "libosi",
         "libprotobuf-cpp-lite",
+        "libstatslog_bt",
         "libudrv-uipc",
         "libutils",
     ],

system/bta/Android.bp

@@ -294,6 +294,7 @@ cc_test {
         "libbtcore",
         "libchrome",
         "libosi",
+        "libstatslog_bt",
     ],
 }
 

system/btif/Android.bp

@@ -229,6 +229,7 @@ cc_library_static {
         "libaudio-a2dp-hw-utils",
         "libbt-audio-hal-interface",
         "libbt-stack-core",
+        "libstatslog_bt",
     ],
     shared_libs: [
         "libcrypto",
@@ -304,6 +305,7 @@ cc_test {
         "libopus",
         "libosi",
         "libprotobuf-cpp-lite",
+        "libstatslog_bt",
         "libudrv-uipc",
     ],
     whole_static_libs: [
@@ -611,6 +613,7 @@ cc_test {
         "libcom.android.sysprop.bluetooth",
         "libevent",
         "libgmock",
+        "libstatslog_bt",
     ],
     cflags: ["-DBUILDCFG"],
     target: {
@@ -743,6 +746,7 @@ cc_test {
         "libcom.android.sysprop.bluetooth",
         "libevent",
         "libgmock",
+        "libstatslog_bt",
     ],
     cflags: ["-DBUILDCFG"],
     target: {

system/build/Android.bp

@@ -87,9 +87,6 @@ cc_defaults {
     defaults: [
         "fluoride_defaults_fuzzable",
     ],
-    static_libs: [
-        "libstatslog_bt",
-    ],
     target: {
         darwin: {
             // libstatslog_bt -> libbinder doesn't build on mac

system/common/Android.bp

@@ -39,6 +39,7 @@ cc_library_static {
                 ":bluetooth-metrics-proto",
                 "metrics.cc",
             ],
+            static_libs: ["libstatslog_bt"],
         },
         host: {
             srcs: ["metrics_linux.cc"],

system/osi/Android.bp

@@ -167,6 +167,7 @@ cc_test {
         "libgmock",
         "libosi",
         "libprotobuf-cpp-lite",
+        "libstatslog_bt",
     ],
     target: {
         android: {

system/stack/Android.bp

@@ -675,6 +675,7 @@ cc_test {
         "libopus",
         "libosi",
         "libprotobuf-cpp-lite",
+        "libstatslog_bt",
         "libudrv-uipc",
     ],
     whole_static_libs: [
@@ -746,6 +747,7 @@ cc_test {
         "liblog",
         "libosi",
         "libprotobuf-cpp-lite",
+        "libstatslog_bt",
     ],
     target: {
         android: {
@@ -939,6 +941,7 @@ cc_test {
         "liblog",
         "libosi",
         "libosi-AllocationTestHarness",
+        "libstatslog_bt",
     ],
     target: {
         android: {
@@ -1004,6 +1007,7 @@ cc_test {
         "libosi",
         "libosi-AllocationTestHarness",
         "libprotobuf-cpp-lite",
+        "libstatslog_bt",
     ],
     target: {
         android: {
@@ -1217,6 +1221,7 @@ cc_test {
         "libgmock",
         "liblog",
         "libosi",
+        "libstatslog_bt",
     ],
     target: {
         android: {
@@ -1325,6 +1330,7 @@ cc_test {
         "liblog",
         "libosi",
         "libprotobuf-cpp-lite",
+        "libstatslog_bt",
     ],
     target: {
         android: {
@@ -1700,6 +1706,7 @@ cc_test {
         "liblog",
         "libosi",
         "libprotobuf-cpp-lite",
+        "libstatslog_bt",
     ],
     shared_libs: [
         "libbinder_ndk",
@@ -1781,6 +1788,7 @@ cc_test {
         "liblog",
         "libosi",
         "libprotobuf-cpp-lite",
+        "libstatslog_bt",
     ],
     shared_libs: [
         "libbinder_ndk",
@@ -1865,6 +1873,7 @@ cc_test {
         "libgmock",
         "liblog",
         "libosi",
+        "libstatslog_bt",
     ],
     shared_libs: [
         "libbinder_ndk",

system/stack/test/fuzzers/Android.bp

@@ -42,6 +42,7 @@ cc_defaults {
         "liblc3",
         "libopus",
         "libosi",
+        "libstatslog_bt",
         "libudrv-uipc",
     ],
     shared_libs: [

system/test/headless/Android.bp

@@ -112,6 +112,7 @@ cc_binary {
         "libopus",
         "libosi",
         "libprotobuf-cpp-lite",
+        "libstatslog_bt",
         "libudrv-uipc",
         "libz",
     ],