diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index fa629d383102a24effc99bcb161663f6e33eeb1d..de5cd33e3a61fd9ced6d274a75c715e9ee251ff0 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -72,7 +72,6 @@ cc_library_static {
},
host_supported: true,
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
"-Wthread-safety",
],
@@ -121,9 +120,6 @@ cc_test {
"libbt_shim_bridge",
"libchrome",
],
- cflags: [
- "-DBUILDCFG",
- ],
header_libs: ["libbluetooth_headers"],
}
@@ -139,7 +135,6 @@ cc_test {
"mts_defaults",
],
cflags: [
- "-DBUILDCFG",
"-DUNIT_TESTS",
"-Wno-unused-parameter",
],
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 2b6b97ba4e8dc3c907164834f1bc4ed8a54dea8d..780bfc1c757109dc28244e467279b8cf79b7ba9b 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -30,7 +30,6 @@ cc_defaults {
generated_headers: [
"BluetoothGeneratedDumpsysDataSchema_h",
],
- cflags: ["-DBUILDCFG"],
}
filegroup {
diff --git a/system/bta/dm/bta_dm_sec.cc b/system/bta/dm/bta_dm_sec.cc
index 234595f7c24768081d0bb3ec17e0abdedd7a25b3..6554583da2f91f631378a2d622fa1564d43800da 100644
--- a/system/bta/dm/bta_dm_sec.cc
+++ b/system/bta/dm/bta_dm_sec.cc
@@ -557,20 +557,16 @@ static tBTM_STATUS bta_dm_sp_cback(tBTM_SP_EVT event,
break;
case BTM_SP_LOC_OOB_EVT:
-#ifdef BTIF_DM_OOB_TEST
btif_dm_proc_loc_oob(BT_TRANSPORT_BR_EDR,
(bool)(p_data->loc_oob.status == BTM_SUCCESS),
p_data->loc_oob.c, p_data->loc_oob.r);
-#endif
break;
case BTM_SP_RMT_OOB_EVT: {
Octet16 c;
Octet16 r;
sp_rmt_result = false;
-#ifdef BTIF_DM_OOB_TEST
sp_rmt_result = btif_dm_proc_rmt_oob(p_data->rmt_oob.bd_addr, &c, &r);
-#endif
log::verbose("result={}", sp_rmt_result);
bta_dm_ci_rmt_oob(sp_rmt_result, p_data->rmt_oob.bd_addr, c, r);
break;
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index e29cafb3aa1655cb07f7b3f0aede2ed913551eff..497cb5fe69f4674f09a51f7256a63db27b97e15c 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -166,7 +166,6 @@ cc_library_static {
"libflatbuffers-cpp",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
apex_available: [
@@ -255,7 +254,6 @@ cc_library_static {
"libcrypto",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
/* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
"-fvisibility=default",
@@ -364,7 +362,6 @@ cc_test {
],
},
},
- cflags: ["-DBUILDCFG"],
sanitize: {
integer_overflow: true,
},
@@ -397,7 +394,6 @@ cc_test {
"libosi",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -437,7 +433,6 @@ cc_test {
"liblog",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
}
@@ -487,7 +482,6 @@ cc_test {
},
},
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
sanitize: {
@@ -531,7 +525,6 @@ cc_test {
"libgmock",
"libosi",
],
- cflags: ["-DBUILDCFG"],
target: {
android: {
static_libs: [
@@ -571,7 +564,6 @@ cc_test {
"libcom.android.sysprop.bluetooth.wrapped",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
}
@@ -678,7 +670,6 @@ cc_test {
"libstatslog_bt",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
target: {
@@ -801,7 +792,6 @@ cc_test {
"libstatslog_bt",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
target: {
diff --git a/system/btif/include/btif_dm.h b/system/btif/include/btif_dm.h
index 71c4c58d855bd67427adf883b704391c1b5924fa..6df5e1c5d83d945e0c7ebe8911e0d7e819f9e943 100644
--- a/system/btif/include/btif_dm.h
+++ b/system/btif/include/btif_dm.h
@@ -90,14 +90,12 @@ void btif_dm_set_oob_for_io_req(tBTM_OOB_DATA* p_oob_data);
void btif_dm_set_oob_for_le_io_req(const RawAddress& bd_addr,
tBTM_OOB_DATA* p_oob_data,
tBTM_LE_AUTH_REQ* p_auth_req);
-#ifdef BTIF_DM_OOB_TEST
void btif_dm_load_local_oob(void);
void btif_dm_proc_loc_oob(tBT_TRANSPORT transport, bool is_valid,
const Octet16& c, const Octet16& r);
bool btif_dm_proc_rmt_oob(const RawAddress& bd_addr, Octet16* p_c,
Octet16* p_r);
void btif_dm_generate_local_oob_data(tBT_TRANSPORT transport);
-#endif /* BTIF_DM_OOB_TEST */
void btif_dm_clear_event_filter();
diff --git a/system/btif/src/btif_core.cc b/system/btif/src/btif_core.cc
index 8fcfe455a5d4918cb242123b853e0c5a3834f154..349722007b2669345286146be296b970f55d085f 100644
--- a/system/btif/src/btif_core.cc
+++ b/system/btif/src/btif_core.cc
@@ -111,9 +111,7 @@ static uid_set_t* uid_set;
* Externs
******************************************************************************/
void btif_dm_enable_service(tBTA_SERVICE_ID service_id, bool enable);
-#ifdef BTIF_DM_OOB_TEST
void btif_dm_load_local_oob(void);
-#endif
/*******************************************************************************
*
@@ -219,9 +217,7 @@ void btif_enable_bluetooth_evt() {
/* load did configuration */
bte_load_did_conf(BTE_DID_CONF_FILE);
-#ifdef BTIF_DM_OOB_TEST
btif_dm_load_local_oob();
-#endif
future_ready(stack_manager_get_hack_future(), FUTURE_SUCCESS);
LOG_INFO("Bluetooth enable event completed");
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index 58d5b2d8d592b5dcfb0e421a1f5e380520f1d90e..324c77c379a094cebd78a38ba73de6e5e91694dc 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -3302,7 +3302,6 @@ void btif_dm_set_oob_for_le_io_req(const RawAddress& bd_addr,
LOG_VERBOSE("*p_has_oob_data=%d", *p_has_oob_data);
}
-#ifdef BTIF_DM_OOB_TEST
void btif_dm_load_local_oob(void) {
char prop_oob[PROPERTY_VALUE_MAX];
osi_property_get("service.brcm.bt.oob", prop_oob, "3");
@@ -3561,7 +3560,6 @@ bool btif_dm_proc_rmt_oob(const RawAddress& bd_addr, Octet16* p_c,
bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);
return true;
}
-#endif /* BTIF_DM_OOB_TEST */
static void btif_dm_ble_key_notif_evt(tBTA_DM_SP_KEY_NOTIF* p_ssp_key_notif) {
RawAddress bd_addr;
diff --git a/system/device/fuzzer/Android.bp b/system/device/fuzzer/Android.bp
index a0ef51b3f3465a02cd5692092d12749d7b6178ee..e600270558ae21fb09cf7d92e793092850c3e885 100644
--- a/system/device/fuzzer/Android.bp
+++ b/system/device/fuzzer/Android.bp
@@ -61,9 +61,6 @@ cc_fuzz {
"packages/modules/Bluetooth/system/device/include",
"packages/modules/Bluetooth/system/gd",
],
- cflags: [
- "-DBUILDCFG",
- ],
fuzz_config: {
cc: ["android-bluetooth-security@google.com"],
componentid: 27441,
diff --git a/system/internal_include/bt_target.h b/system/internal_include/bt_target.h
index abbe58367b1d1f586e82d1d3789aeba6f8dea107..9009dd3e7379bb09290eefe93c101b9cec73ae8f 100644
--- a/system/internal_include/bt_target.h
+++ b/system/internal_include/bt_target.h
@@ -20,10 +20,6 @@
#ifndef BT_TARGET_H
#define BT_TARGET_H
-#ifndef BUILDCFG
-#define BUILDCFG
-#endif
-
#ifndef FALSE
#define FALSE false
#endif
@@ -91,10 +87,6 @@
#define AG_VOICE_SETTINGS HCI_DEFAULT_VOICE_SETTINGS
#endif
-#ifndef BTIF_DM_OOB_TEST
-#define BTIF_DM_OOB_TEST TRUE
-#endif
-
// How long to wait before activating sniff mode after entering the
// idle state for server FT/RFCOMM, OPS connections
#ifndef BTA_FTS_OPS_IDLE_TO_SNIFF_DELAY_MS
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 1959629821461797431928ef0200e6a810e945d1..8393fa7b25805c3b3d9d3c6e390136e868cefa10 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -108,9 +108,6 @@ cc_library {
// that might link statically with some of the code in the library, and
// also dlopen(3) the shared library.
ldflags: ["-Wl,-Bsymbolic,-Bsymbolic-functions"],
- cflags: [
- "-DBUILDCFG",
- ],
sanitize: {
scs: true,
},
@@ -142,7 +139,6 @@ cc_library_static {
"BluetoothGeneratedDumpsysDataSchema_h",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: [
diff --git a/system/packet/Android.bp b/system/packet/Android.bp
index e0bd28ad84186f475f539cddda8c8e8348310143..1e3f9c44b9ef5b43e6525edfb0f967adc2507c36 100644
--- a/system/packet/Android.bp
+++ b/system/packet/Android.bp
@@ -83,7 +83,6 @@ cc_test {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
target: {
diff --git a/system/packet/tests/fuzzers/Android.bp b/system/packet/tests/fuzzers/Android.bp
index a99de59d134be30605b79c780742669f3f22d45a..a617b4875194ca63a841ac80289d9b7a843f7d85 100644
--- a/system/packet/tests/fuzzers/Android.bp
+++ b/system/packet/tests/fuzzers/Android.bp
@@ -37,7 +37,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -74,7 +73,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -111,7 +109,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -148,7 +145,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -185,7 +181,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -222,7 +217,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -259,7 +253,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -296,7 +289,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -333,7 +325,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -370,7 +361,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -407,7 +397,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -444,7 +433,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -481,7 +469,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -518,7 +505,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -555,7 +541,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -592,7 +577,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -629,7 +613,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -666,7 +649,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -703,7 +685,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -740,7 +721,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -777,7 +757,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -814,7 +793,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -851,7 +829,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -888,7 +865,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
@@ -925,7 +901,6 @@ cc_fuzz {
"libgmock",
],
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
shared_libs: ["liblog"],
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index f664baa0fdae8584071e31575a32dc1a5f68fd6c..fa7012701e51b35494e0e5120f142f2d45b1f1b0 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -88,7 +88,6 @@ cc_test {
},
cflags: [
- "-DBUILDCFG",
"-Wno-unused-parameter",
],
header_libs: ["libbluetooth_headers"],
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 0f624e3ec672e254a53ba99ce88b79670c0d1aca..2dc14fd14b48c6ab61a3ab7e67c7fda9e2e35567 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -320,7 +320,6 @@ cc_defaults {
name: "btstack_fuzzer_default",
host_supported: true,
cflags: [
- "-DHAS_NO_BDROID_BUILDCFG",
"-Wall",
"-Werror",
"-Wextra",