summaryrefslogtreecommitdiff
path: root/system/build
diff options
context:
space:
mode:
author David Duarte <licorne@google.com> 2023-08-11 18:18:00 +0000
committer David Duarte <licorne@google.com> 2023-08-11 18:18:12 +0000
commit70fe75e9aa3fee50b05e7ff0ef034a1ef9a7dd88 (patch)
treeaf2f25e229baa24016e6d6bc3c95ff473270d066 /system/build
parente4e61fa2edb942a850885e8138652e879a87733d (diff)
Merge fluoride_defaults and fluoride_default_fuzzable
Those two defaults are providing the same properties Test: mmm packages/modules/Bluetooth Bug: 279502784 Change-Id: I62ada5912eeee005b54c9009ef7fc4da28150aa1
Diffstat (limited to 'system/build')
-rw-r--r--system/build/Android.bp20
1 files changed, 1 insertions, 19 deletions
diff --git a/system/build/Android.bp b/system/build/Android.bp
index 3520ceeae6..241abfc4f2 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -29,7 +29,7 @@ cc_defaults {
}
cc_defaults {
- name: "fluoride_defaults_fuzzable",
+ name: "fluoride_defaults",
target: {
android: {
test_config_template: ":BluetoothTestConfigTemplate",
@@ -56,21 +56,3 @@ cc_defaults {
"libbt_shim_ffi",
],
}
-
-cc_defaults {
- name: "fluoride_defaults",
- defaults: [
- "fluoride_defaults_fuzzable",
- ],
- target: {
- darwin: {
- // libstatslog_bt -> libbinder doesn't build on mac
- enabled: false,
- },
- android: {
- sanitize: {
- misc_undefined: ["bounds"],
- },
- },
- },
-}