diff --git a/android/app/Android.bp b/android/app/Android.bp
index 3a634ee6297e0b8dc6c0a7082ca76bb0d8ca556f..ae6f315ddde6f13bfb2916c1a8cbf62ee8921c3f 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -55,7 +55,7 @@ java_library {
cc_library_shared {
name: "libbluetooth_jni",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
srcs: ["jni/**/*.cpp"],
version_script: "libbluetooth_jni.map",
header_libs: [
@@ -150,7 +150,7 @@ cc_library_shared {
cc_library {
name: "libbluetooth-core",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
header_libs: [
"jni_headers",
"libbluetooth_headers",
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index e954d516511aa71c250492259fcc57709dc1cf77..518161945bc40bebddf85c37978426538195fbd9 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -9,7 +9,7 @@ package {
cc_defaults {
name: "fluoride_bta_defaults",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
local_include_dirs: [
"dm",
"hd",
diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp
index 0361a809c065cd7308a2f30d98a6f8be15f6e8ae..5e4b9de0dd483731cf4050fb841d41df004a182f 100644
--- a/system/btcore/Android.bp
+++ b/system/btcore/Android.bp
@@ -10,7 +10,7 @@ package {
cc_defaults {
name: "libbtcore_defaults",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
local_include_dirs: ["include"],
include_dirs: [
"packages/modules/Bluetooth/system",
@@ -36,7 +36,7 @@ cc_defaults {
cc_library_static {
name: "libbthalutils",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
srcs: [
"src/hal_util.cc",
],
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index ec1e88534ec60624124a905838b2a79342343f2d..4763e8b233a93610b0b2be9f7228f7a5072fe71f 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -89,7 +89,7 @@ genrule {
cc_library_static {
name: "libbtif",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
include_dirs: btifCommonIncludes,
srcs: [
// AVRCP Target Service
@@ -171,7 +171,7 @@ cc_library_static {
cc_library_static {
name: "libbtif-core",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
include_dirs: btifCommonIncludes,
srcs: [
// Callouts
diff --git a/system/build/Android.bp b/system/build/Android.bp
index b11e24b17e6ed56ac3816fc600d9d472fda24620..76b9b476f3f3191dc7e4649293908c69a615ddba 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -82,13 +82,6 @@ cc_defaults {
},
}
-cc_defaults {
- name: "fluoride_basic_defaults",
- defaults: [
- "fluoride_defaults",
- ],
-}
-
cc_defaults {
name: "fluoride_defaults",
defaults: [
diff --git a/system/common/Android.bp b/system/common/Android.bp
index b6caee54dfc0eb12b9c039ca6af816f530a577ae..c40182d5b791ad46a9269654f1ee622290c598f5 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -10,7 +10,7 @@ package {
cc_library_static {
name: "libbt-common",
defaults: [
- "fluoride_basic_defaults",
+ "fluoride_defaults",
],
host_supported: true,
include_dirs: [
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 8a57219a8e6d1b424214cd7d8a5d23addda4520b..33a04833b07b6a8fbeb49d0c2d7e9298fbfe6272 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -10,7 +10,7 @@ package {
cc_library_static {
name: "libbtdevice",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
host_supported: true,
local_include_dirs: [
"include",
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index 549e3e14d62306ad10d7591051eb1651e1901aa9..3212482c83f1ca7e71299d7a9eeb844acb61f4b2 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -10,7 +10,7 @@ package {
// HCI static library for target
cc_library_static {
name: "libbt-hci",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
srcs: [
"src/buffer_allocator.cc",
"src/packet_fragmenter.cc",
@@ -45,7 +45,7 @@ cc_test {
test_suites: ["device-tests"],
defaults: [
"bluetooth_gtest_x86_asan_workaround",
- "fluoride_basic_defaults",
+ "fluoride_defaults",
"fluoride_test_defaults",
"mts_defaults",
],
diff --git a/system/main/Android.bp b/system/main/Android.bp
index 8df37214ac8a4894148e5fdbd372131c07acf44f..123d749bc02aed3fb26c7078022fd2a5a3317bad 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -20,7 +20,7 @@ filegroup {
cc_library_static {
name: "libbte",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
srcs: [
":LibBluetoothShimSources",
":LibBluetoothSources",
@@ -66,7 +66,7 @@ cc_library {
"//packages/modules/Bluetooth:__subpackages__",
"//vendor:__subpackages__",
],
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
header_libs: ["libbluetooth_headers"],
export_header_lib_headers: ["libbluetooth_headers"],
include_dirs: [
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index b20d4ac63ca5643e943d11fcfc6a5589129fb025..f5c6fc8e689e0051b273d9cbeea4ed8d5404250d 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -65,7 +65,7 @@ cc_library_static {
"include_internal",
],
defaults: [
- "fluoride_basic_defaults",
+ "fluoride_defaults",
"fluoride_osi_defaults",
],
// TODO(mcchou): Remove socket_utils sources after platform specific
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 453de681db74fd7f75dde9bb648644348e48b2ec..894ce0326660240b642e671ff3a92c1d0288b222 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -32,7 +32,7 @@ cc_test_library {
// Bluetooth stack static library for target
cc_library_static {
name: "libbt-stack",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
local_include_dirs: [
"avct",
"avdt",
@@ -169,7 +169,7 @@ filegroup {
cc_library_static {
name: "libbt-stack-core",
- defaults: ["fluoride_basic_defaults"],
+ defaults: ["fluoride_defaults"],
local_include_dirs: [
"avct",
"avdt",