From c3680d29089a87be20c51cdfe09151e051e68e5f Mon Sep 17 00:00:00 2001 From: Etienne Ruffieux <eruffieux@google.com> Date: Thu, 19 May 2022 04:22:04 +0000 Subject: [PATCH] Add mts-bluetooth to native tests test-suites Tag: #feature Test: atest net_test_* Bug: 232577476 Ignore-AOSP-First: module not in AOSP Change-Id: Ibd60ff8979c2bfad7e9ff1a3f0ffbc5918ff215f --- system/audio_a2dp_hw/Android.bp | 5 +- system/audio_hearing_aid_hw/Android.bp | 5 +- system/bta/Android.bp | 23 ++++++- system/btcore/Android.bp | 5 +- system/btif/Android.bp | 30 +++++++-- system/common/Android.bp | 6 +- system/device/Android.bp | 5 +- system/gd/Android.bp | 12 +++- system/gd/dumpsys/Android.bp | 1 + system/gd/rust/stack/Android.bp | 5 +- system/hci/Android.bp | 16 ++++- system/main/Android.bp | 5 +- system/osi/Android.bp | 5 +- system/packet/Android.bp | 5 +- system/profile/avrcp/Android.bp | 1 + system/profile/sdp/Android.bp | 1 + system/service/Android.bp | 5 +- system/stack/Android.bp | 86 +++++++++++++++++++++----- system/test/Android.bp | 18 ++++++ system/test/headless/Android.bp | 5 +- system/test/suite/Android.bp | 5 +- system/types/Android.bp | 5 +- 22 files changed, 210 insertions(+), 44 deletions(-) diff --git a/system/audio_a2dp_hw/Android.bp b/system/audio_a2dp_hw/Android.bp index 55587a95fe9..7d774806d19 100644 --- a/system/audio_a2dp_hw/Android.bp +++ b/system/audio_a2dp_hw/Android.bp @@ -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", ], diff --git a/system/audio_hearing_aid_hw/Android.bp b/system/audio_hearing_aid_hw/Android.bp index 7ca723e287c..cb5f110f235 100644 --- a/system/audio_hearing_aid_hw/Android.bp +++ b/system/audio_hearing_aid_hw/Android.bp @@ -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", ], diff --git a/system/bta/Android.bp b/system/bta/Android.bp index 020a06d9e04..e42d452b7bf 100644 --- a/system/bta/Android.bp +++ b/system/bta/Android.bp @@ -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, include_dirs: [ @@ -677,6 +691,7 @@ cc_test { defaults: [ "fluoride_bta_defaults", "clang_coverage_bin", + "mts_defaults", ], host_supported: true, include_dirs: [ @@ -724,6 +739,7 @@ cc_test { defaults: [ "fluoride_bta_defaults", "clang_coverage_bin", + "mts_defaults", ], host_supported: true, include_dirs: [ @@ -791,6 +807,7 @@ cc_test { defaults: [ "fluoride_bta_defaults", "clang_coverage_bin", + "mts_defaults", ], host_supported: true, include_dirs: [ diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp index 5a8179387d3..82ca35b6588 100644 --- a/system/btcore/Android.bp +++ b/system/btcore/Android.bp @@ -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: [ diff --git a/system/btif/Android.bp b/system/btif/Android.bp index 8fdcf037aa4..4e016e6d788 100644 --- a/system/btif/Android.bp +++ b/system/btif/Android.bp @@ -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", diff --git a/system/common/Android.bp b/system/common/Android.bp index 80075732835..64c9ce35b29 100644 --- a/system/common/Android.bp +++ b/system/common/Android.bp @@ -47,6 +47,7 @@ cc_test { defaults: [ "fluoride_defaults", "clang_coverage_bin", + "mts_defaults", ], host_supported: true, test_options: { @@ -92,7 +93,10 @@ cc_test { cc_test { name: "net_test_performance", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], test_suites: ["device-tests"], include_dirs: ["packages/modules/Bluetooth/system"], host_supported: true, diff --git a/system/device/Android.bp b/system/device/Android.bp index 774f94620aa..105dbe560d7 100644 --- a/system/device/Android.bp +++ b/system/device/Android.bp @@ -33,7 +33,10 @@ cc_library_static { cc_test { name: "net_test_device", test_suites: ["device-tests"], - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], include_dirs: ["packages/modules/Bluetooth/system"], srcs: [ "test/interop_test.cc", diff --git a/system/gd/Android.bp b/system/gd/Android.bp index 386585d946b..ca4c2b08ba7 100644 --- a/system/gd/Android.bp +++ b/system/gd/Android.bp @@ -317,6 +317,7 @@ cc_test { "gd_defaults", "gd_clang_coverage_bin", "libchrome_support_defaults", + "mts_defaults", ], host_supported: true, test_options: { @@ -406,6 +407,7 @@ cc_test { "gd_defaults", "gd_clang_coverage_bin", "libchrome_support_defaults", + "mts_defaults", ], include_dirs: ["packages/modules/Bluetooth/system/gd"], host_supported: true, @@ -612,7 +614,10 @@ rust_library { rust_test_host { name: "libbt_packets_test", - defaults: ["gd_rust_defaults"], + defaults: [ + "gd_rust_defaults", + "mts_defaults", + ], srcs: ["rust/packets/lib.rs", ":BluetoothGeneratedPackets_rust"], test_suites: ["general-tests"], edition: "2018", @@ -642,7 +647,10 @@ genrule { rust_test_host { name: "packets_test_rust", - defaults: ["gd_rust_defaults"], + defaults: [ + "gd_rust_defaults", + "mts_defaults", + ], srcs: ["rust/packets/test_lib.rs", ":TestGeneratedPackets_rust"], test_suites: ["general-tests"], edition: "2018", diff --git a/system/gd/dumpsys/Android.bp b/system/gd/dumpsys/Android.bp index 7b742c30d07..0241b008cc4 100644 --- a/system/gd/dumpsys/Android.bp +++ b/system/gd/dumpsys/Android.bp @@ -177,6 +177,7 @@ cc_library { cc_test { name: "bluetooth_flatbuffer_tests", test_suites: ["device-tests"], + defaults: ["mts_defaults"], host_supported: true, test_options: { unit_test: true, diff --git a/system/gd/rust/stack/Android.bp b/system/gd/rust/stack/Android.bp index 19d373b07db..37d71369fa1 100644 --- a/system/gd/rust/stack/Android.bp +++ b/system/gd/rust/stack/Android.bp @@ -54,7 +54,10 @@ rust_library { rust_test_host { name: "libbluetooth_rs_test", - defaults: ["gd_rust_defaults"], + defaults: [ + "gd_rust_defaults", + "mts_defaults", + ], srcs: ["src/lib.rs"], test_suites: ["general-tests"], edition: "2018", diff --git a/system/hci/Android.bp b/system/hci/Android.bp index af495661b15..d9f954253ef 100644 --- a/system/hci/Android.bp +++ b/system/hci/Android.bp @@ -58,7 +58,11 @@ cc_library_static { cc_test { name: "net_test_hci", test_suites: ["device-tests"], - defaults: ["fluoride_basic_defaults", "fluoride_test_defaults"], + defaults: [ + "fluoride_basic_defaults", + "fluoride_test_defaults", + "mts_defaults", + ], host_supported: false, local_include_dirs: [ "include", @@ -91,7 +95,10 @@ cc_test { cc_test { name: "net_test_hci_native", test_suites: ["device-tests"], - defaults: ["fluoride_unit_test_defaults"], + defaults: [ + "fluoride_unit_test_defaults", + "mts_defaults", + ], local_include_dirs: [ "include", ], @@ -109,7 +116,10 @@ cc_test { cc_test { name: "net_test_hci_fragmenter_native", test_suites: ["device-tests"], - defaults: ["fluoride_unit_test_defaults"], + defaults: [ + "fluoride_unit_test_defaults", + "mts_defaults", + ], local_include_dirs: [ "include", ], diff --git a/system/main/Android.bp b/system/main/Android.bp index 3acba7cca9b..8f8a245a095 100644 --- a/system/main/Android.bp +++ b/system/main/Android.bp @@ -152,7 +152,10 @@ cc_test { test_options: { unit_test: true, }, - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], include_dirs: [ "packages/modules/Bluetooth/system", "packages/modules/Bluetooth/system/gd", diff --git a/system/osi/Android.bp b/system/osi/Android.bp index e33701d3f06..bcbac81bb1f 100644 --- a/system/osi/Android.bp +++ b/system/osi/Android.bp @@ -109,7 +109,10 @@ cc_library_static { cc_test { name: "net_test_osi", test_suites: ["device-tests"], - defaults: ["fluoride_osi_defaults"], + defaults: [ + "fluoride_osi_defaults", + "mts_defaults", + ], host_supported: true, srcs: [ "test/AlarmTestHarness.cc", diff --git a/system/packet/Android.bp b/system/packet/Android.bp index 4d8cb9277c4..1033fc6a426 100644 --- a/system/packet/Android.bp +++ b/system/packet/Android.bp @@ -27,7 +27,10 @@ cc_library_static { cc_test { name: "net_test_btpackets", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], test_suites: ["device-tests"], host_supported: true, test_options: { diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp index 8622dea7f13..72e9b1bb624 100644 --- a/system/profile/avrcp/Android.bp +++ b/system/profile/avrcp/Android.bp @@ -48,6 +48,7 @@ cc_test { "fluoride_defaults", "clang_coverage_bin", "libchrome_support_defaults", + "mts_defaults", ], host_supported: true, test_options: { diff --git a/system/profile/sdp/Android.bp b/system/profile/sdp/Android.bp index 7db1a4d4b41..1c2f9edc10d 100644 --- a/system/profile/sdp/Android.bp +++ b/system/profile/sdp/Android.bp @@ -32,6 +32,7 @@ cc_test { defaults: [ "fluoride_defaults", "clang_coverage_bin", + "mts_defaults", ], host_supported: true, include_dirs: [ diff --git a/system/service/Android.bp b/system/service/Android.bp index 92d71fce638..cfd29794e22 100644 --- a/system/service/Android.bp +++ b/system/service/Android.bp @@ -156,7 +156,10 @@ cc_binary { cc_test { name: "bluetoothtbd_test", test_suites: ["device-tests"], - defaults: ["fluoride_service_defaults"], + defaults: [ + "fluoride_service_defaults", + "mts_defaults", + ], srcs: btserviceBaseTestSrc + btserviceDaemonSrc + [ "test/main.cc", diff --git a/system/stack/Android.bp b/system/stack/Android.bp index 93690e056d7..85095aed8c6 100644 --- a/system/stack/Android.bp +++ b/system/stack/Android.bp @@ -213,7 +213,10 @@ cc_library_static { // Bluetooth stack unit tests for target cc_test { name: "net_test_stack", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], test_suites: ["device-tests"], local_include_dirs: [ "include", @@ -276,7 +279,10 @@ cc_test { cc_test { name: "net_test_stack_rfcomm", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], test_suites: ["device-tests"], host_supported: true, local_include_dirs: [ @@ -335,7 +341,10 @@ cc_test { // Bluetooth stack smp unit tests for target cc_test { name: "net_test_stack_smp", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], host_supported: true, test_suites: ["device-tests"], local_include_dirs: [ @@ -395,7 +404,10 @@ cc_test { // Bluetooth stack multi-advertising unit tests for target cc_test { name: "net_test_stack_multi_adv", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], test_suites: ["device-tests"], local_include_dirs: [ "include", @@ -434,7 +446,10 @@ cc_test { // Bluetooth stack advertise data parsing unit tests for target cc_test { name: "net_test_stack_ad_parser", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], test_suites: ["device-tests"], local_include_dirs: [ "include", @@ -490,7 +505,10 @@ cc_test { cc_test { name: "net_test_stack_gatt_native", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], test_suites: ["device-tests"], host_supported: true, test_options: { @@ -535,7 +553,10 @@ cc_test { cc_test { name: "net_test_stack_avdtp", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], test_suites: ["device-tests"], host_supported: true, test_options: { @@ -586,7 +607,10 @@ cc_test { cc_test { name: "net_test_stack_a2dp_native", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], test_suites: ["device-tests"], host_supported: true, test_options: { @@ -629,7 +653,10 @@ cc_test { // gatt sr hash test cc_test { name: "net_test_stack_gatt_sr_hash_native", - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], test_suites: ["device-tests"], host_supported: true, include_dirs: [ @@ -673,7 +700,10 @@ cc_test { test_options: { unit_test: true, }, - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], local_include_dirs: [ "btm", "include", @@ -719,6 +749,7 @@ cc_test { defaults: [ "fluoride_defaults", "clang_coverage_bin", + "mts_defaults", ], local_include_dirs: [ "include", @@ -766,7 +797,10 @@ cc_test { test_options: { unit_test: true, }, - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], local_include_dirs: [ "include", "btm", @@ -860,7 +894,10 @@ cc_test { name: "net_test_stack_hci", test_suites: ["device-tests"], host_supported: true, - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], local_include_dirs: [ "include", "btm", @@ -903,7 +940,10 @@ cc_test { name: "net_test_stack_hid", test_suites: ["device-tests"], host_supported: true, - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], local_include_dirs: [ "include", "test/common", @@ -952,7 +992,10 @@ cc_test { name: "net_test_stack_btu", test_suites: ["device-tests"], host_supported: true, - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], local_include_dirs: [ "include", "test/common", @@ -1011,7 +1054,10 @@ cc_test { name: "net_test_stack_gatt", test_suites: ["device-tests"], host_supported: true, - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], local_include_dirs: [ "include", "test/common", @@ -1082,7 +1128,10 @@ cc_test { name: "net_test_stack_l2cap", test_suites: ["device-tests"], host_supported: true, - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], local_include_dirs: [ "include", "test/common", @@ -1151,7 +1200,10 @@ cc_test { name: "net_test_stack_acl", test_suites: ["device-tests"], host_supported: true, - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], local_include_dirs: [ "include", "test/common", diff --git a/system/test/Android.bp b/system/test/Android.bp index 7754163ae79..f99db16f616 100644 --- a/system/test/Android.bp +++ b/system/test/Android.bp @@ -451,3 +451,21 @@ filegroup { "mock/mock_legacy_hci_iterface.cc" ], } + +cc_defaults { + name: "mts_defaults", + target: { + android: { + test_suites: ["mts-bluetooth",], + }, + }, + compile_multilib: "both", + multilib: { + lib32: { + suffix: "32", + }, + lib64: { + suffix: "64", + }, + }, +} diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp index 42b222f79e1..87f94c1b2a9 100644 --- a/system/test/headless/Android.bp +++ b/system/test/headless/Android.bp @@ -10,7 +10,10 @@ package { cc_test { name: "bt_headless", test_suites: ["device-tests"], - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], srcs: [ "connect/connect.cc", "get_options.cc", diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp index b7fd0ed256f..ec9545fa907 100644 --- a/system/test/suite/Android.bp +++ b/system/test/suite/Android.bp @@ -109,7 +109,10 @@ cc_defaults { cc_test { name: "net_test_bluetooth", test_suites: ["device-tests"], - defaults: ["net_test_defaults"], + defaults: [ + "net_test_defaults", + "mts_defaults", + ], srcs: [ "adapter/adapter_unittest.cc", "gatt/gatt_test.cc", diff --git a/system/types/Android.bp b/system/types/Android.bp index b0be0d7b0ba..2009df6f150 100644 --- a/system/types/Android.bp +++ b/system/types/Android.bp @@ -49,7 +49,10 @@ cc_library_static { cc_test { name: "net_test_types", test_suites: ["device-tests"], - defaults: ["fluoride_defaults"], + defaults: [ + "fluoride_defaults", + "mts_defaults", + ], include_dirs: [ "packages/modules/Bluetooth/system", ], -- GitLab