From 628d74712f947d06155f86b23d60a30e96881cb6 Mon Sep 17 00:00:00 2001
From: David Duarte <licorne@google.com>
Date: Thu, 31 Aug 2023 03:55:39 +0000
Subject: [PATCH] Remove libbluetooth_headers from fluoride_defaults
Bug: 279502784
Test: mmm packages/modules/Bluetooth
Change-Id: Ie36c3674193858660c783a0916c3b7f14a725fe2
---
system/audio_hal_interface/Android.bp | 2 ++
system/bta/Android.bp | 2 ++
system/btcore/Android.bp | 1 +
system/btif/Android.bp | 1 +
system/build/Android.bp | 1 -
system/common/Android.bp | 4 ++++
system/device/Android.bp | 3 +++
system/hci/Android.bp | 1 +
system/main/Android.bp | 3 +++
system/osi/Android.bp | 2 ++
system/osi/test/fuzzers/alarm/Android.bp | 1 +
system/profile/avrcp/Android.bp | 2 ++
system/profile/sdp/Android.bp | 1 +
system/stack/Android.bp | 20 ++++++++++++++++++++
system/test/headless/Android.bp | 1 +
system/udrv/Android.bp | 1 +
16 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index eface2645f0..59eee9dfa1d 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -71,6 +71,7 @@ cc_library_static {
"com.android.btservices",
],
min_sdk_version: "Tiramisu",
+ header_libs: ["libbluetooth_headers"],
}
// Bluetooth Audio client interface library unit tests for target and host
@@ -104,4 +105,5 @@ cc_test {
cflags: [
"-DBUILDCFG",
],
+ header_libs: ["libbluetooth_headers"],
}
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 2abe4746bcd..a10fc8ba5f2 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -718,6 +718,7 @@ cc_test {
sanitize: {
cfi: false,
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -811,6 +812,7 @@ cc_test {
sanitize: {
cfi: false,
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp
index ba65af7df89..42f95e492a8 100644
--- a/system/btcore/Android.bp
+++ b/system/btcore/Android.bp
@@ -111,4 +111,5 @@ cc_test {
sanitize: {
address: true,
},
+ header_libs: ["libbluetooth_headers"],
}
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 06fbf2e10c8..fae227f26ec 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -242,6 +242,7 @@ cc_library_static {
],
host_supported: true,
min_sdk_version: "Tiramisu",
+ header_libs: ["libbluetooth_headers"],
}
// btif unit tests for target
diff --git a/system/build/Android.bp b/system/build/Android.bp
index bc5688a992c..d86e70b70fa 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -32,7 +32,6 @@ cc_defaults {
},
},
defaults: ["fluoride_types_defaults_fuzzable"],
- header_libs: ["libbluetooth_headers"],
static_libs: [
"libbluetooth-types",
"libbluetooth_rust_interop",
diff --git a/system/common/Android.bp b/system/common/Android.bp
index f622c95da56..1d684a622ac 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -52,6 +52,7 @@ cc_library_static {
"com.android.btservices",
],
min_sdk_version: "Tiramisu",
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -103,6 +104,7 @@ cc_test {
sanitize: {
cfi: false,
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -128,6 +130,7 @@ cc_test {
"libgmock",
"libosi",
],
+ header_libs: ["libbluetooth_headers"],
}
cc_benchmark {
@@ -150,4 +153,5 @@ cc_benchmark {
"libevent",
"libosi",
],
+ header_libs: ["libbluetooth_headers"],
}
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 0a116d59e4f..ce586719d69 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -32,6 +32,7 @@ cc_library_static {
"com.android.btservices",
],
min_sdk_version: "Tiramisu",
+ header_libs: ["libbluetooth_headers"],
}
// Bluetooth device unit tests for target
@@ -59,6 +60,7 @@ cc_test {
"libchrome",
"libosi",
],
+ header_libs: ["libbluetooth_headers"],
}
// Bluetooth device unit tests for target
@@ -92,4 +94,5 @@ cc_test {
"libchrome",
"libgmock",
],
+ header_libs: ["libbluetooth_headers"],
}
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index 48bd6fb8b9c..015a53ae9f7 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -36,6 +36,7 @@ cc_library_static {
],
host_supported: true,
min_sdk_version: "Tiramisu",
+ header_libs: ["libbluetooth_headers"],
}
// HCI unit tests for target
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 860827c7ba4..6e0e6b41bf8 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -56,6 +56,7 @@ cc_library_static {
host_supported: true,
min_sdk_version: "Tiramisu",
static_libs: ["libbluetooth_gd"],
+ header_libs: ["libbluetooth_headers"],
}
cc_library {
@@ -147,6 +148,7 @@ cc_library_static {
whole_static_libs: [
"libbluetooth_gd", // Gabeldorsche
],
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -231,4 +233,5 @@ cc_test {
"BluetoothGeneratedPackets_h",
],
min_sdk_version: "Tiramisu",
+ header_libs: ["libbluetooth_headers"],
}
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index d131a392d6b..197a8406371 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -87,6 +87,7 @@ cc_library_static {
apex_available: [
"com.android.btservices",
],
+ header_libs: ["libbluetooth_headers"],
}
// libosi unit tests for target and host
@@ -151,4 +152,5 @@ cc_test {
address: true,
cfi: false,
},
+ header_libs: ["libbluetooth_headers"],
}
diff --git a/system/osi/test/fuzzers/alarm/Android.bp b/system/osi/test/fuzzers/alarm/Android.bp
index 4e09043cce1..b28bcca2aed 100644
--- a/system/osi/test/fuzzers/alarm/Android.bp
+++ b/system/osi/test/fuzzers/alarm/Android.bp
@@ -28,4 +28,5 @@ cc_fuzz {
"libosi",
],
cflags: ["-Wno-unused-function"],
+ header_libs: ["libbluetooth_headers"],
}
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index 719697cb5e9..95d60b3c020 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -39,6 +39,7 @@ cc_library_static {
"com.android.btservices",
],
min_sdk_version: "Tiramisu",
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -83,6 +84,7 @@ cc_test {
},
cflags: ["-DBUILDCFG"],
+ header_libs: ["libbluetooth_headers"],
}
cc_fuzz {
diff --git a/system/profile/sdp/Android.bp b/system/profile/sdp/Android.bp
index d524ce7ca6b..80689723430 100644
--- a/system/profile/sdp/Android.bp
+++ b/system/profile/sdp/Android.bp
@@ -24,6 +24,7 @@ cc_library_static {
"lib-bt-packets",
"libbluetooth-types",
],
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index c21d77b8db5..ceac11a43e2 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -27,6 +27,7 @@ cc_test_library {
"liblog",
],
srcs: crypto_toolbox_srcs,
+ header_libs: ["libbluetooth_headers"],
}
// Bluetooth stack static library for target
@@ -675,6 +676,7 @@ cc_test {
whole_static_libs: [
"libbluetooth-for-tests",
],
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -753,6 +755,7 @@ cc_test {
sanitize: {
cfi: false,
},
+ header_libs: ["libbluetooth_headers"],
}
// Bluetooth stack smp unit tests for target
@@ -818,6 +821,7 @@ cc_test {
"liblog",
"libosi",
],
+ header_libs: ["libbluetooth_headers"],
}
// Bluetooth stack advertise data parsing unit tests for target
@@ -888,6 +892,7 @@ cc_test {
sanitize: {
cfi: false,
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -948,6 +953,7 @@ cc_test {
cfi: true,
misc_undefined: ["bounds"],
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -1011,6 +1017,7 @@ cc_test {
cfi: true,
misc_undefined: ["bounds"],
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -1120,6 +1127,7 @@ cc_test {
cfi: true,
misc_undefined: ["bounds"],
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -1160,6 +1168,7 @@ cc_test {
cfi: true,
misc_undefined: ["bounds"],
},
+ header_libs: ["libbluetooth_headers"],
}
// gatt sr hash test
@@ -1218,6 +1227,7 @@ cc_test {
shared_libs: ["libstatssocket"],
},
},
+ header_libs: ["libbluetooth_headers"],
}
// Iso manager unit tests
@@ -1267,6 +1277,7 @@ cc_test {
undefined: true,
},
},
+ header_libs: ["libbluetooth_headers"],
}
// EATT unit tests
@@ -1330,6 +1341,7 @@ cc_test {
sanitize: {
cfi: false,
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -1453,6 +1465,7 @@ cc_test {
undefined: true,
},
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -1499,6 +1512,7 @@ cc_test {
undefined: true,
},
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -1561,6 +1575,7 @@ cc_test {
undefined: true,
},
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -1627,6 +1642,7 @@ cc_test {
undefined: true,
},
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -1716,6 +1732,7 @@ cc_test {
undefined: true,
},
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -1801,6 +1818,7 @@ cc_test {
undefined: true,
},
},
+ header_libs: ["libbluetooth_headers"],
}
cc_test {
@@ -1882,6 +1900,7 @@ cc_test {
undefined: true,
},
},
+ header_libs: ["libbluetooth_headers"],
}
// Bluetooth stack connection multiplexing
@@ -1928,4 +1947,5 @@ cc_test {
"libgmock",
"liblog",
],
+ header_libs: ["libbluetooth_headers"],
}
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index 7518cd6f7c7..bb0d332fc5d 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -127,4 +127,5 @@ cc_binary {
"libstatssocket",
"libutils",
],
+ header_libs: ["libbluetooth_headers"],
}
diff --git a/system/udrv/Android.bp b/system/udrv/Android.bp
index 8b0534f8f3e..85647816470 100644
--- a/system/udrv/Android.bp
+++ b/system/udrv/Android.bp
@@ -28,4 +28,5 @@ cc_library_static {
"com.android.btservices",
],
min_sdk_version: "Tiramisu",
+ header_libs: ["libbluetooth_headers"],
}
--
GitLab