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

Commit 502c50a3 authored by David Duarte's avatar David Duarte
Browse files

Inline fluoride_test_defaults in net_test_hci 

net_test_hci was the only user.

Bug: 279502784
Test: m net_test_hci
Change-Id: I42b88344664fad0488b3d0e3e81271f93c62dbe4
parent bfc49e38

system/build/Android.bp

+0 −23
Original line number Diff line number Diff line
@@ -58,29 +58,6 @@ cc_defaults { 
    min_sdk_version: "current",

}



cc_defaults {

    name: "fluoride_test_defaults",

    defaults: ["fluoride_defaults"],

    host_supported: true,

    shared_libs: [

        "libcrypto",

        "liblog",

    ],

    static_libs: [

        "libbt-common",

        "libcutils",

        "libgmock",

        "libosi",

        "libosi-AlarmTestHarness",

        "libosi-AllocationTestHarness",

    ],

    sanitize: {

        address: true,

        cfi: true,

        misc_undefined: ["bounds"],

    },

}



cc_defaults {

    name: "fluoride_defaults",

    defaults: [

system/hci/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -45,10 +45,8 @@ cc_test { 
    defaults: [

        "bluetooth_gtest_x86_asan_workaround",

        "fluoride_defaults",

        "fluoride_test_defaults",

        "mts_defaults",

    ],

    host_supported: false,

    local_include_dirs: [

        "include",

    ],
@@ -67,11 +65,19 @@ cc_test { 
        "android.hardware.bluetooth.audio@2.1",

        "libbase",

        "libdl",

        "liblog",

    ],

    static_libs: [

        "libbluetooth-for-tests",

        "libbt-hci",

        "libbtcore",

        "libchrome",

        "libosi",

        "libosi-AllocationTestHarness",

    ],

    sanitize: {

        address: true,

        cfi: true,

        misc_undefined: ["bounds"],

    },

}