From b7650292e4103032003f886395c4e02c398d758b Mon Sep 17 00:00:00 2001
From: David Duarte <licorne@google.com>
Date: Thu, 3 Aug 2023 22:08:06 +0000
Subject: [PATCH] Remove fluoride_basic_defaults
Bug: 279502784
Test: mmm packages/modules/Bluetooth
Change-Id: Iec785861eab6f2eed51833c9bfc4247cb7546663
---
android/app/Android.bp | 4 ++--
system/bta/Android.bp | 2 +-
system/btcore/Android.bp | 4 ++--
system/btif/Android.bp | 4 ++--
system/build/Android.bp | 7 -------
system/common/Android.bp | 2 +-
system/device/Android.bp | 2 +-
system/hci/Android.bp | 4 ++--
system/main/Android.bp | 4 ++--
system/osi/Android.bp | 2 +-
system/stack/Android.bp | 4 ++--
11 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/android/app/Android.bp b/android/app/Android.bp
index 3a634ee6297..ae6f315ddde 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 e954d516511..518161945bc 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 0361a809c06..5e4b9de0dd4 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 ec1e88534ec..4763e8b233a 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 b11e24b17e6..76b9b476f3f 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 b6caee54dfc..c40182d5b79 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 8a57219a8e6..33a04833b07 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 549e3e14d62..3212482c83f 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 8df37214ac8..123d749bc02 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 b20d4ac63ca..f5c6fc8e689 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 453de681db7..894ce032666 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",
--
GitLab