From 847f5c05af714b54187e4a83f9f01e6edbd07683 Mon Sep 17 00:00:00 2001
From: David Duarte <licorne@google.com>
Date: Thu, 31 Aug 2023 06:33:41 +0000
Subject: [PATCH] Remove libbt_shim_ffi from fluoride_defaults
Bug: 279502784
Test: mmm packages/modules/Bluetooth
Change-Id: I88c41d6c67e09fe0743d41f1bd67fc91ea60fee5
---
system/bta/Android.bp | 14 ++++++++++++++
system/btif/Android.bp | 5 +++++
system/build/Android.bp | 3 ---
system/device/Android.bp | 2 ++
system/device/fuzzer/Android.bp | 1 +
system/main/Android.bp | 1 +
system/osi/Android.bp | 1 +
system/profile/avrcp/Android.bp | 2 ++
system/stack/Android.bp | 21 +++++++++++++++++++++
9 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index d3b6493f9fe..1e285a6272e 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -250,6 +250,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtcore",
"libchrome",
"libcom.android.sysprop.bluetooth",
@@ -298,6 +299,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtcore",
"libchrome",
"libosi",
@@ -416,6 +418,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtcore",
"libbtdevice",
"libchrome",
@@ -479,6 +482,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libgmock",
"libosi",
@@ -525,6 +529,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libgmock",
"libosi",
@@ -583,6 +588,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libgmock",
"libosi",
@@ -728,6 +734,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
"libflatbuffers-cpp",
@@ -824,6 +831,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
"libflatbuffers-cpp",
@@ -901,6 +909,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
"libflatbuffers-cpp",
@@ -965,6 +974,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libgmock",
"libosi",
@@ -1021,6 +1031,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libgmock",
],
@@ -1086,6 +1097,7 @@ cc_test {
"libbt-audio-hal-interface",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
"libgmock",
@@ -1148,6 +1160,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libgmock",
],
@@ -1213,6 +1226,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libcom.android.sysprop.bluetooth",
"libevent",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 0a70ed12f27..d1b18ef493a 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -354,6 +354,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libosi",
],
@@ -387,6 +388,7 @@ cc_test {
static_libs: [
"libbluetooth-types",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libosi",
],
@@ -427,6 +429,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
],
@@ -616,6 +619,7 @@ cc_test {
"libbt-stack",
"libbt-stack-core",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtdevice",
"libbtif",
"libbtif-core",
@@ -750,6 +754,7 @@ cc_test {
"libbt-sbc-decoder",
"libbt-sbc-encoder",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtdevice",
"libbtif",
"libbtif-core",
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 0caa1a1ad7d..78fa84736be 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -32,7 +32,4 @@ cc_defaults {
},
},
defaults: ["fluoride_types_defaults_fuzzable"],
- static_libs: [
- "libbt_shim_ffi",
- ],
}
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 5d8f3181711..c418b831bb3 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -57,6 +57,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtcore",
"libbtdevice",
"libchrome",
@@ -93,6 +94,7 @@ cc_test {
"libbluetooth-types",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtcore",
"libbtdevice",
"libchrome",
diff --git a/system/device/fuzzer/Android.bp b/system/device/fuzzer/Android.bp
index 0112ef88057..085b184e48f 100644
--- a/system/device/fuzzer/Android.bp
+++ b/system/device/fuzzer/Android.bp
@@ -37,6 +37,7 @@ cc_fuzz {
"libbluetooth-types",
"libbluetooth_gd",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtcore",
"libbtdevice",
"libchrome",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index f1defb59200..aa89cf80047 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -217,6 +217,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtdevice",
"libchrome",
"libevent",
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index da06228b920..2326dc360a9 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -135,6 +135,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libc++fs",
"libchrome",
"libevent",
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index f30f016c813..6b829e2933c 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -74,6 +74,7 @@ cc_test {
"libbluetooth-types",
"libbluetooth_gd",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtdevice",
"libchrome",
"libcutils",
@@ -115,6 +116,7 @@ cc_fuzz {
"libbluetooth-types",
"libbluetooth_gd",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libcutils",
"libevent",
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 66e1084b6fd..9c00c1eae13 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -400,6 +400,7 @@ cc_fuzz {
"libbluetooth-types",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
],
}
@@ -444,6 +445,7 @@ cc_fuzz {
"libbluetooth-types",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libgmock",
],
}
@@ -484,6 +486,7 @@ cc_fuzz {
"libbluetooth-types",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libgmock",
],
}
@@ -524,6 +527,7 @@ cc_fuzz {
"libbluetooth-types",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libgmock",
],
}
@@ -566,6 +570,7 @@ cc_fuzz {
"libbluetooth-types",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libgmock",
"libosi",
],
@@ -613,6 +618,7 @@ cc_fuzz {
"libbluetooth-types",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libgmock",
],
target: {
@@ -766,6 +772,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
"libgmock",
@@ -847,6 +854,7 @@ cc_test {
"libbluetooth_gd",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
"libgmock",
@@ -917,6 +925,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
"libgmock",
@@ -969,6 +978,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
"libgmock",
@@ -1037,6 +1047,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
"liblog",
@@ -1149,6 +1160,7 @@ cc_test {
"libbt-sbc-decoder",
"libbt-sbc-encoder",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libgmock",
"liblog",
@@ -1258,6 +1270,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
"libgmock",
@@ -1372,6 +1385,7 @@ cc_test {
"libbluetooth_gd",
"libbt-common",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libevent",
"libgmock",
@@ -1493,6 +1507,7 @@ cc_test {
"libbt-sbc-decoder",
"libbt-sbc-encoder",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtdevice",
"libchrome",
"libevent",
@@ -1602,6 +1617,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtdevice",
"libbte",
"libchrome",
@@ -1678,6 +1694,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtdevice",
"libchrome",
"libevent",
@@ -1763,6 +1780,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtdevice",
"libchrome",
"libevent",
@@ -1849,6 +1867,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtdevice",
"libchrome",
"libevent",
@@ -1939,6 +1958,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libbtdevice",
"libchrome",
"libevent",
@@ -2011,6 +2031,7 @@ cc_test {
"libbt-common",
"libbt-platform-protos-lite",
"libbt_shim_bridge",
+ "libbt_shim_ffi",
"libchrome",
"libgmock",
"liblog",
--
GitLab