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

Commit 7dcc07f7 authored by David Duarte's avatar David Duarte
Browse files

Merge fluoride_types_defaults_fuzzable into fluoride_defaults 

Bug: 279502784
Test: mmm packages/modules/Bluetooth
Change-Id: Ic06553084705126866c44ee731261d197224052e
parent a8d114ff

system/build/Android.bp

+1 −8
Original line number Diff line number Diff line
@@ -7,10 +7,8 @@ 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\")))",
@@ -19,10 +17,6 @@ cc_defaults { 
        // struct BT_HDR is defined as a variable-size header in a struct.

        "-Wno-gnu-variable-sized-type-not-at-end",

    ],

}



cc_defaults {

    name: "fluoride_defaults",

    target: {

        android: {

            test_config_template: ":BluetoothTestConfigTemplate",
@@ -31,5 +25,4 @@ cc_defaults { 
            },

        },

    },

    defaults: ["fluoride_types_defaults_fuzzable"],

}

system/types/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ cc_library_headers { 
cc_library_static {

    name: "libbluetooth-types",

    vendor_available: true,

    defaults: ["fluoride_types_defaults_fuzzable"],

    defaults: ["fluoride_defaults"],

    cflags: [

        /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/

        "-fvisibility=default",