summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/build/Android.bp9
-rw-r--r--system/types/Android.bp2
2 files changed, 2 insertions, 9 deletions
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 1727328cf3..8999d96d1d 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -7,20 +7,14 @@ package {
default_applicable_licenses: ["system_bt_license"],
}
-// Fuzzable defaults are the subset of defaults that are used in fuzzing, which
-// requires no shared libraries, and no explicit sanitization.
cc_defaults {
- name: "fluoride_types_defaults_fuzzable",
+ name: "fluoride_defaults",
defaults: ["bluetooth_cflags"],
cflags: [
"-DEXPORT_SYMBOL=__attribute__((visibility(\"default\")))",
"-DLOG_NDEBUG=1",
"-fvisibility=hidden",
],
-}
-
-cc_defaults {
- name: "fluoride_defaults",
target: {
android: {
test_config_template: ":BluetoothTestConfigTemplate",
@@ -29,5 +23,4 @@ cc_defaults {
},
},
},
- defaults: ["fluoride_types_defaults_fuzzable"],
}
diff --git a/system/types/Android.bp b/system/types/Android.bp
index 1a4af0b669..f12bccd3c8 100644
--- a/system/types/Android.bp
+++ b/system/types/Android.bp
@@ -32,7 +32,7 @@ cc_library_headers {
cc_library_static {
name: "libbluetooth-types",
vendor_available: true,
- defaults: ["fluoride_types_defaults_fuzzable"],
+ defaults: ["fluoride_defaults"],
cflags: [
/* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
"-fvisibility=default",