Merge "Merge fluoride_defaults and fluoride_default_fuzzable" into main

system/build/Android.bp

@@ -22,7 +22,7 @@ cc_defaults {
 }
 
 cc_defaults {
-    name: "fluoride_defaults_fuzzable",
+    name: "fluoride_defaults",
     target: {
         android: {
             test_config_template: ":BluetoothTestConfigTemplate",
@@ -41,21 +41,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"],
-            },
-        },
-    },
-}

system/profile/avrcp/Android.bp

@@ -89,7 +89,7 @@ cc_fuzz {
     name: "avrcp_device_fuzz",
     host_supported: true,
     defaults: [
-        "fluoride_defaults_fuzzable",
+        "fluoride_defaults",
     ],
     srcs: [
         "tests/avrcp_device_fuzz/avrcp_device_fuzz.cc",

system/stack/Android.bp

@@ -377,7 +377,7 @@ cc_fuzz {
     name: "sdp-fuzzer",
     defaults: [
         "btstack_fuzzer_default",
-        "fluoride_defaults_fuzzable",
+        "fluoride_defaults",
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system/stack/btm",
@@ -401,7 +401,7 @@ cc_fuzz {
     name: "gatt-fuzzer",
     defaults: [
         "btstack_fuzzer_default",
-        "fluoride_defaults_fuzzable",
+        "fluoride_defaults",
     ],
     include_dirs: [
         "external/flatbuffers/include",
@@ -443,7 +443,7 @@ cc_fuzz {
     name: "smp-fuzzer",
     defaults: [
         "btstack_fuzzer_default",
-        "fluoride_defaults_fuzzable",
+        "fluoride_defaults",
     ],
     include_dirs: [
         "external/flatbuffers/include",
@@ -480,7 +480,7 @@ cc_fuzz {
     name: "bnep-fuzzer",
     defaults: [
         "btstack_fuzzer_default",
-        "fluoride_defaults_fuzzable",
+        "fluoride_defaults",
     ],
     include_dirs: [
         "external/flatbuffers/include",
@@ -517,7 +517,7 @@ cc_fuzz {
     name: "avrc-fuzzer",
     defaults: [
         "btstack_fuzzer_default",
-        "fluoride_defaults_fuzzable",
+        "fluoride_defaults",
     ],
     include_dirs: [
         "external/flatbuffers/include",
@@ -564,7 +564,7 @@ cc_fuzz {
     name: "l2cap-fuzzer",
     defaults: [
         "btstack_fuzzer_default",
-        "fluoride_defaults_fuzzable",
+        "fluoride_defaults",
     ],
     include_dirs: [
         "external/flatbuffers/include",