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

Commit bd97e0b1 authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Add mts-bluetooth to native tests test-suites" into tm-dev am: b07401c9 

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



Change-Id: Ic45ccd0a5ed709038d6d9aa271a1029afdb2afad
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc27c4ac b07401c9

system/audio_a2dp_hw/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -52,7 +52,10 @@ cc_library_static { 
cc_test {

    name: "net_test_audio_a2dp_hw",

    test_suites: ["device-tests"],

    defaults: ["audio_a2dp_hw_defaults"],

    defaults: [

        "audio_a2dp_hw_defaults",

        "mts_defaults",

    ],

    srcs: [

        "test/audio_a2dp_hw_test.cc",

    ],

system/audio_hearing_aid_hw/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -40,7 +40,10 @@ cc_library { 
cc_test {

    name: "net_test_audio_hearing_aid_hw",

    test_suites: ["device-tests"],

    defaults: ["audio_hearing_aid_hw_defaults"],

    defaults: [

        "audio_hearing_aid_hw_defaults",

        "mts_defaults",

    ],

    srcs: [

        "test/audio_hearing_aid_hw_test.cc",

    ],

system/bta/Android.bp

+20 −3
Original line number Diff line number Diff line
@@ -153,7 +153,10 @@ cc_library_static { 
// bta unit tests for target

cc_test {

    name: "net_test_bta",

    defaults: ["fluoride_bta_defaults"],

    defaults: [

        "fluoride_bta_defaults",

        "mts_defaults"

    ],

    test_suites: ["device-tests"],

    srcs: [

        ":TestMockStackBtm",
@@ -192,7 +195,10 @@ cc_test { 


cc_test {

    name: "bt_host_test_bta",

    defaults: ["fluoride_bta_defaults"],

    defaults: [

        "fluoride_bta_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    host_supported: true,

    include_dirs: [
@@ -266,7 +272,10 @@ cc_test { 
// bta hf client add record tests for target

cc_test {

    name: "net_test_hf_client_add_record",

    defaults: ["fluoride_defaults"],

    defaults: [

        "fluoride_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    include_dirs: [

        "packages/modules/Bluetooth/system",
@@ -300,6 +309,7 @@ cc_test { 
    defaults: [

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

    ],

    host_supported: true,

    include_dirs: [
@@ -353,6 +363,7 @@ cc_test { 
    defaults: [

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

    ],

    host_supported: true,

    include_dirs: [
@@ -394,6 +405,7 @@ cc_test { 
    defaults: [

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

    ],

    host_supported: true,

    include_dirs: [
@@ -512,6 +524,7 @@ cc_test { 
    defaults: [

        "fluoride_defaults",

        "clang_coverage_bin",

        "mts_defaults",

    ],

    host_supported: true,

    target: {
@@ -591,6 +604,7 @@ cc_test { 
    defaults: [

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

    ],

    host_supported: true,

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -679,6 +693,7 @@ cc_test { 
    defaults: [

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

    ],

    host_supported: true,

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -728,6 +743,7 @@ cc_test { 
    defaults: [

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

    ],

    host_supported: true,

    include_dirs: [
@@ -795,6 +811,7 @@ cc_test { 
    defaults: [

        "fluoride_bta_defaults",

        "clang_coverage_bin",

        "mts_defaults",

    ],

    host_supported: true,

    // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below

system/btcore/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -64,7 +64,10 @@ cc_library_headers { 
cc_test {

    name: "net_test_btcore",

    test_suites: ["device-tests"],

    defaults: ["fluoride_defaults"],

    defaults: [

        "fluoride_defaults",

        "mts_defaults",

    ],

    local_include_dirs: ["include"],

    include_dirs: ["packages/modules/Bluetooth/system"],

    srcs: [

system/btif/Android.bp

+24 −6
Original line number Diff line number Diff line
@@ -196,7 +196,10 @@ cc_library_static { 
// btif unit tests for target

cc_test {

    name: "net_test_btif",

    defaults: ["fluoride_defaults"],

    defaults: [

        "fluoride_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    include_dirs: btifCommonIncludes,

    srcs: [
@@ -259,7 +262,10 @@ cc_test { 
// btif profile queue unit tests for target

cc_test {

    name: "net_test_btif_profile_queue",

    defaults: ["fluoride_defaults"],

    defaults: [

        "fluoride_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    include_dirs: btifCommonIncludes,

    srcs: [
@@ -286,7 +292,10 @@ cc_test { 
// btif rc unit tests for target

cc_test {

    name: "net_test_btif_rc",

    defaults: ["fluoride_defaults"],

    defaults: [

        "fluoride_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    host_supported: true,

    test_options: {
@@ -321,7 +330,10 @@ cc_test { 
// btif config cache unit tests for target

cc_test {

    name: "net_test_btif_config_cache",

    defaults: ["fluoride_defaults"],

    defaults: [

        "fluoride_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    host_supported: true,

    test_options: {
@@ -358,7 +370,10 @@ cc_test { 
// btif hf client service tests for target

cc_test {

    name: "net_test_btif_hf_client_service",

    defaults: ["fluoride_defaults"],

    defaults: [

        "fluoride_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    include_dirs: btifCommonIncludes,

    srcs: [
@@ -380,7 +395,10 @@ cc_test { 
cc_test {

    name: "net_test_btif_stack",

    host_supported: true,

    defaults: ["fluoride_defaults"],

    defaults: [

        "fluoride_defaults",

        "mts_defaults",

    ],

    test_suites: ["device-tests"],

    include_dirs: [

        "frameworks/av/media/libaaudio/include",