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

Commit cd1c12db authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove dependencies on the 1-variant fallback" into main

parents 49abfa51 eda47ee2

android/pandora/test/Android.bp

+6 −2
Original line number Diff line number Diff line
@@ -39,9 +39,11 @@ python_test_host { 
        unit_test: false,

    },

    data: [

        ":PandoraServer",

        "config.yml",

    ],

    device_common_data: [

        ":PandoraServer",

    ],

}



python_test_host {
@@ -68,9 +70,11 @@ python_test_host { 
        unit_test: false,

    },

    data: [

        ":PandoraServer",

        "config.yml",

    ],

    device_common_data: [

        ":PandoraServer",

    ],

}



sh_binary_host {

framework/tests/bumble/Android.bp

+4 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ java_test_host { 
        "tradefed",

    ],



    data: [

    device_common_data: [

        ":BumbleBluetoothTestsApp",

        "bumble_config.json",

    ],
@@ -80,9 +80,11 @@ java_test_host { 
    ],



    data: [

        ":BumbleBluetoothTestsApp",

        "bumble_config.json",

    ],

    device_common_data: [

        ":BumbleBluetoothTestsApp",

    ],

    data_native_bins: [

        "bumble_pandora_server",

    ],

framework/tests/metrics/host/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ java_test_host { 
        "tradefed",

    ],



    data: [

    device_common_data: [

        ":BluetoothMetricsTestApp",

    ],

system/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -307,11 +307,13 @@ cc_genrule { 
        ":BlueberryFacadeAndCertGeneratedStub_py",

        ":bluetooth_cert_test_host_deps-zip",

        ":bluetooth_cert_test_sources-zip",

        ":bluetooth_cert_test_target_deps-zip",

        ":gd_hci_packets_python3_gen-zip",

        ":gd_smp_packets_python3_gen-zip",

        ":llvm-tools-zip",

    ],

    device_first_srcs: [

        ":bluetooth_cert_test_target_deps-zip",

    ],

    out: ["bluetooth_cert_tests.zip"],

    cmd: "$(location merge_zips) $(genDir)/temp.zip $(in) && " +

        "unzip -q -d $(genDir)/files $(genDir)/temp.zip && " +

system/bta/Android.bp

+4 −4
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ cc_test { 
        "libgmock",

        "server_configurable_flags",

    ],

    data: [

    device_first_data: [

        ":audio_set_configurations_bfbs",

        ":audio_set_configurations_json",

        ":audio_set_scenarios_bfbs",
@@ -792,7 +792,7 @@ cc_test { 
        "le_audio/le_audio_types.cc",

        "le_audio/le_audio_utils.cc",

    ],

    data: [

    device_first_data: [

        ":audio_set_configurations_bfbs",

        ":audio_set_configurations_json",

        ":audio_set_scenarios_bfbs",
@@ -901,7 +901,7 @@ cc_test { 
        "test/common/btm_api_mock.cc",

        "test/common/mock_csis_client.cc",

    ],

    data: [

    device_first_data: [

        ":audio_set_configurations_bfbs",

        ":audio_set_configurations_json",

        ":audio_set_scenarios_bfbs",
@@ -1027,7 +1027,7 @@ cc_test { 
        "libosi",

        "server_configurable_flags",

    ],

    data: [

    device_first_data: [

        ":audio_set_configurations_bfbs",

        ":audio_set_configurations_json",

        ":audio_set_scenarios_bfbs",