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

Commit 066366a6 authored by Hui Peng's avatar Hui Peng
Browse files

Factor out the fuzz config in bp files 

There are multiple fuzz_config dispersed in the bp files.
This patch factors out the duplicated config with cc_defaults

Test: refactor patch, existing tests pass
Change-Id: I4e4f3424336790f438370f810d11e08d5151c6bb
parent 7852bafd

system/audio_hal_interface/fuzzer/Android.bp

+3 −4
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ package { 


cc_defaults {

    name: "libbt_audio_hal_interface_fuzz_defaults",

    defaults: [

        "fluoride_common_fuzz_defaults",

    ],

    header_libs: [

        "avrcp_headers",

        "libbluetooth_headers",
@@ -103,10 +106,6 @@ cc_defaults { 
    cflags: [

        "-DHAS_NO_BDROID_BUILDCFG",

    ],

    fuzz_config: {

        cc: ["android-bluetooth-security@google.com"],

        componentid: 27441,

    },

}



cc_fuzz {

system/btcore/fuzzer/Android.bp

+3 −4
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ package { 


cc_defaults {

    name: "btcore_fuzz_defaults",

    defaults: [

        "fluoride_common_fuzz_defaults",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

        "android.hardware.bluetooth@1.1",
@@ -56,10 +59,6 @@ cc_defaults { 
    header_libs: [

        "libbluetooth_headers",

    ],

    fuzz_config: {

        cc: ["android-bluetooth-security@google.com"],

        componentid: 27441,

    },

}



cc_fuzz {

system/build/Android.bp

+11 −0
Original line number Diff line number Diff line
@@ -107,6 +107,17 @@ fluoride_defaults { 
    },

}



// common options for all fuzzers

// e.g., sanitizers, cflags

// TODO: factorout the satnizer flags 

cc_defaults {

    name: "fluoride_common_fuzz_defaults",

    fuzz_config: {

        cc: ["android-bluetooth-security@google.com"],

        componentid: 27441,

    },

}



fluoride_defaults {

    name: "fluoride_types_defaults",

    defaults: [

system/device/fuzzer/Android.bp

+4 −5
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ package { 


cc_fuzz {

    name: "btdevice_esco_fuzzer",

    defaults: ["fluoride_defaults"],

    defaults: [

        "fluoride_defaults",

        "fluoride_common_fuzz_defaults",

    ],

    srcs: [

        "btdevice_esco_fuzzer.cpp",

    ],
@@ -46,8 +49,4 @@ cc_fuzz { 
    cflags: [

        "-DBUILDCFG",

    ],

    fuzz_config: {

       cc: ["android-bluetooth-security@google.com"],

       componentid: 27441,

    },

}

system/embdrv/g722/fuzzer/Android.bp

+3 −4
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ package { 


cc_fuzz {

    name: "g722_fuzzer",

    defaults: [

        "fluoride_common_fuzz_defaults",

    ],

    srcs: [

        "g722_fuzzer.cc",

    ],
@@ -16,8 +19,4 @@ cc_fuzz { 
    static_libs: [

        "libg722codec",

    ],

    fuzz_config: {

        cc: ["android-bluetooth-security@google.com"],

        componentid: 27441,

    },

}