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

Commit c3f9d513 authored by William Escande's avatar William Escande
Browse files

Flag lib link: Use test variant when building test 

Bug: 311772251
Test: mmm p/m/Bluetooth
Flag: Exempt build change
Change-Id: Id1843bd56a8355a4247b0953df1af5363e8a3a9e
parent 1e01f541

system/audio_hal_interface/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ cc_test { 
        "android.hardware.bluetooth@1.1",

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_log",
@@ -308,7 +308,7 @@ cc_test { 
    static_libs: [

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbluetooth-types",

        "libbluetooth_log",

        "libbt-bta",
@@ -349,7 +349,7 @@ cc_test { 
        "le_audio_software_unittest.cc",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbt-bta",

        "libbt-platform-protos-lite",

        "libcutils",

system/gd/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ cc_test { 
        "BluetoothGeneratedDumpsysTestData_h",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbase",

        "libbluetooth-dumpsys",

        "libbluetooth-dumpsys-test",

system/gd/rust/topshim/facade/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ rust_test_host { 
    name: "bt_topshim_facade.test",

    defaults: ["bt_topshim_facade.defaults"],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

    ],

    test_suites: ["general-tests"],

}

system/main/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ cc_test { 
        "test/main_shim_test.cc",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbase",

        "libbluetooth-dumpsys",

        "libbluetooth-gdx",
@@ -290,7 +290,7 @@ cc_test { 
        "test/main_shim_stack_dumpsys_test.cc",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbase",

        "libbluetooth-dumpsys",

        "libbluetooth-gdx",

system/stack/Android.bp

+10 −10
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ cc_test { 
        "android.hardware.common.fmq-V1-ndk",

        "android.system.suspend-V1-ndk",

        "android.system.suspend.control-V1-ndk",

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libFraunhoferAAC",

        "libbase",

        "libbluetooth-dumpsys",
@@ -906,7 +906,7 @@ cc_test { 
        "libcutils",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbluetooth-types",
@@ -999,7 +999,7 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",
@@ -1143,7 +1143,7 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",
@@ -1216,7 +1216,7 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libaconfig_storage_read_api_cc",

        "libbase",

        "libbluetooth-types",
@@ -1446,7 +1446,7 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",
@@ -1714,7 +1714,7 @@ cc_test { 
        "test/stack_include_test.cc",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",
@@ -2004,7 +2004,7 @@ cc_test { 
        "test/gatt/stack_gatt_test.cc",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",
@@ -2296,7 +2296,7 @@ cc_test { 
        "test/stack_rnr_test.cc",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",
@@ -2371,7 +2371,7 @@ cc_test { 
        "test/sdp/stack_sdp_utils_test.cc",

    ],

    static_libs: [

        "bluetooth_flags_c_lib",

        "bluetooth_flags_c_lib_for_test",

        "libbase",

        "libbluetooth-types",

        "libbluetooth_gd",