Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70fe75e9 authored by David Duarte's avatar David Duarte
Browse files

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
parent e4e61fa2

system/build/Android.bp

+1 −19
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ cc_defaults { 
}

}





cc_defaults {

cc_defaults {

    name: "fluoride_defaults_fuzzable",

    name: "fluoride_defaults",

    target: {

    target: {

        android: {

        android: {

            test_config_template: ":BluetoothTestConfigTemplate",

            test_config_template: ":BluetoothTestConfigTemplate",
@@ -56,21 +56,3 @@ cc_defaults { 
        "libbt_shim_ffi",

        "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

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ cc_fuzz { 
    name: "avrcp_device_fuzz",

    name: "avrcp_device_fuzz",

    host_supported: true,

    host_supported: true,

    defaults: [

    defaults: [

        "fluoride_defaults_fuzzable",

        "fluoride_defaults",

    ],

    ],

    srcs: [

    srcs: [

        "tests/avrcp_device_fuzz/avrcp_device_fuzz.cc",

        "tests/avrcp_device_fuzz/avrcp_device_fuzz.cc",

system/stack/Android.bp

+6 −6
Original line number Original line Diff line number Diff line
@@ -377,7 +377,7 @@ cc_fuzz { 
    name: "sdp-fuzzer",

    name: "sdp-fuzzer",

    defaults: [

    defaults: [

        "btstack_fuzzer_default",

        "btstack_fuzzer_default",

        "fluoride_defaults_fuzzable",

        "fluoride_defaults",

    ],

    ],

    include_dirs: [

    include_dirs: [

        "packages/modules/Bluetooth/system/stack/btm",

        "packages/modules/Bluetooth/system/stack/btm",
@@ -401,7 +401,7 @@ cc_fuzz { 
    name: "gatt-fuzzer",

    name: "gatt-fuzzer",

    defaults: [

    defaults: [

        "btstack_fuzzer_default",

        "btstack_fuzzer_default",

        "fluoride_defaults_fuzzable",

        "fluoride_defaults",

    ],

    ],

    include_dirs: [

    include_dirs: [

        "external/flatbuffers/include",

        "external/flatbuffers/include",
@@ -443,7 +443,7 @@ cc_fuzz { 
    name: "smp-fuzzer",

    name: "smp-fuzzer",

    defaults: [

    defaults: [

        "btstack_fuzzer_default",

        "btstack_fuzzer_default",

        "fluoride_defaults_fuzzable",

        "fluoride_defaults",

    ],

    ],

    include_dirs: [

    include_dirs: [

        "external/flatbuffers/include",

        "external/flatbuffers/include",
@@ -480,7 +480,7 @@ cc_fuzz { 
    name: "bnep-fuzzer",

    name: "bnep-fuzzer",

    defaults: [

    defaults: [

        "btstack_fuzzer_default",

        "btstack_fuzzer_default",

        "fluoride_defaults_fuzzable",

        "fluoride_defaults",

    ],

    ],

    include_dirs: [

    include_dirs: [

        "external/flatbuffers/include",

        "external/flatbuffers/include",
@@ -517,7 +517,7 @@ cc_fuzz { 
    name: "avrc-fuzzer",

    name: "avrc-fuzzer",

    defaults: [

    defaults: [

        "btstack_fuzzer_default",

        "btstack_fuzzer_default",

        "fluoride_defaults_fuzzable",

        "fluoride_defaults",

    ],

    ],

    include_dirs: [

    include_dirs: [

        "external/flatbuffers/include",

        "external/flatbuffers/include",
@@ -564,7 +564,7 @@ cc_fuzz { 
    name: "l2cap-fuzzer",

    name: "l2cap-fuzzer",

    defaults: [

    defaults: [

        "btstack_fuzzer_default",

        "btstack_fuzzer_default",

        "fluoride_defaults_fuzzable",

        "fluoride_defaults",

    ],

    ],

    include_dirs: [

    include_dirs: [

        "external/flatbuffers/include",

        "external/flatbuffers/include",