diff options
-rw-r--r-- | android/app/Android.bp | 1 | ||||
-rw-r--r-- | system/bta/Android.bp | 1 | ||||
-rw-r--r-- | system/btif/Android.bp | 4 | ||||
-rw-r--r-- | system/build/Android.bp | 3 | ||||
-rw-r--r-- | system/common/Android.bp | 1 | ||||
-rw-r--r-- | system/osi/Android.bp | 1 | ||||
-rw-r--r-- | system/stack/Android.bp | 9 | ||||
-rw-r--r-- | system/stack/test/fuzzers/Android.bp | 1 | ||||
-rw-r--r-- | system/test/headless/Android.bp | 1 |
9 files changed, 19 insertions, 3 deletions
diff --git a/android/app/Android.bp b/android/app/Android.bp index 239d410074..990d6e8347 100644 --- a/android/app/Android.bp +++ b/android/app/Android.bp @@ -128,6 +128,7 @@ cc_library_shared { "libopus", "libosi", "libprotobuf-cpp-lite", + "libstatslog_bt", "libudrv-uipc", "libutils", ], diff --git a/system/bta/Android.bp b/system/bta/Android.bp index 0805b45f6e..bd6a236c94 100644 --- a/system/bta/Android.bp +++ b/system/bta/Android.bp @@ -294,6 +294,7 @@ cc_test { "libbtcore", "libchrome", "libosi", + "libstatslog_bt", ], } diff --git a/system/btif/Android.bp b/system/btif/Android.bp index 097d66908d..df7b15e789 100644 --- a/system/btif/Android.bp +++ b/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: { diff --git a/system/build/Android.bp b/system/build/Android.bp index 52a5850179..85fd7e2981 100644 --- a/system/build/Android.bp +++ b/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 diff --git a/system/common/Android.bp b/system/common/Android.bp index c40182d5b7..3f6e6c0c6a 100644 --- a/system/common/Android.bp +++ b/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"], diff --git a/system/osi/Android.bp b/system/osi/Android.bp index 917fe1280a..26c5b1530c 100644 --- a/system/osi/Android.bp +++ b/system/osi/Android.bp @@ -167,6 +167,7 @@ cc_test { "libgmock", "libosi", "libprotobuf-cpp-lite", + "libstatslog_bt", ], target: { android: { diff --git a/system/stack/Android.bp b/system/stack/Android.bp index 197383a7ad..f14131c5a1 100644 --- a/system/stack/Android.bp +++ b/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", diff --git a/system/stack/test/fuzzers/Android.bp b/system/stack/test/fuzzers/Android.bp index d187b961ed..5f1e3d2009 100644 --- a/system/stack/test/fuzzers/Android.bp +++ b/system/stack/test/fuzzers/Android.bp @@ -42,6 +42,7 @@ cc_defaults { "liblc3", "libopus", "libosi", + "libstatslog_bt", "libudrv-uipc", ], shared_libs: [ diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp index e1f667cc34..9e18852502 100644 --- a/system/test/headless/Android.bp +++ b/system/test/headless/Android.bp @@ -112,6 +112,7 @@ cc_binary { "libopus", "libosi", "libprotobuf-cpp-lite", + "libstatslog_bt", "libudrv-uipc", "libz", ], |