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

Commit a681b856 authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "Revert "Factor out the fuzz config in bp files"" am: 3cb0ffe5 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2393681



Change-Id: If5d34d37c0219e56fe33e307cd9d2ed57d07fd2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b8fedc0a 3cb0ffe5

system/audio_hal_interface/fuzzer/Android.bp

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


cc_defaults {

    name: "libbt_audio_hal_interface_fuzz_defaults",

    defaults: [

        "fluoride_common_fuzz_defaults",

    ],

    header_libs: [

        "avrcp_headers",

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

        "-DHAS_NO_BDROID_BUILDCFG",

    ],

    fuzz_config: {

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

        componentid: 27441,

    },

}



cc_fuzz {

system/btcore/fuzzer/Android.bp

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


cc_defaults {

    name: "btcore_fuzz_defaults",

    defaults: [

        "fluoride_common_fuzz_defaults",

    ],

    shared_libs: [

        "android.hardware.bluetooth@1.0",

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

        "libbluetooth_headers",

    ],

    fuzz_config: {

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

        componentid: 27441,

    },

}



cc_fuzz {

system/build/Android.bp

+0 −11
Original line number Diff line number Diff line
@@ -107,17 +107,6 @@ 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

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


cc_fuzz {

    name: "btdevice_esco_fuzzer",

    defaults: [

        "fluoride_defaults",

        "fluoride_common_fuzz_defaults",

    ],

    defaults: ["fluoride_defaults"],

    srcs: [

        "btdevice_esco_fuzzer.cpp",

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

        "-DBUILDCFG",

    ],

    fuzz_config: {

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

       componentid: 27441,

    },

}

system/embdrv/g722/fuzzer/Android.bp

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


cc_fuzz {

    name: "g722_fuzzer",

    defaults: [

        "fluoride_common_fuzz_defaults",

    ],

    srcs: [

        "g722_fuzzer.cc",

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

        "libg722codec",

    ],

    fuzz_config: {

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

        componentid: 27441,

    },

}