Merge "Merge fluoride_types_defaults_fuzzable into fluoride_defaults" into main

1 files changed, 1 insertions, 8 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"],
 }