TEST_MAPPING: Add Bluetooth unit tests to TEST_MAPPING

1. Moved previously added tests from postsubmit to presubmit.
2. Added missing unit tests to postsubmit.
3. Updated presubmit config to also run host tests on device (required for MTS)
4. Updated Mainline presubmit to match current presubmit config.

Bug: 393400512
Change-Id: Idcf6a2001f43af3ad268cccfd68a478a7f88995a
Test: presubmit

5 files changed, 148 insertions, 57 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index d3205af4c9..2b6e8f8d6e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -12,6 +12,11 @@
     {
       "name": "ServiceBluetoothTests"
     },
+    // Device only tests
+    // Broken
+    //{
+    //  "name": "bluetooth-test-audio-hal-interface"
+    //},
     {
       "name": "net_test_audio_hearing_aid_hw"
     },
@@ -19,51 +24,34 @@
       "name": "net_test_bluetooth"
     },
     {
-      "name": "net_test_bta"
-    },
-    {
-      "name": "net_test_bta_security"
-    },
-    {
-      "name": "net_test_btif"
-    },
-    {
       "name": "net_test_btif_hf_client_service"
     },
     {
       "name": "net_test_btif_profile_queue"
     },
     {
-      "name": "net_test_btif_avrcp_audio_track"
-    },
-    {
       "name": "net_test_device"
     },
     {
       "name": "net_test_device_iot_config"
     },
     {
-      "name": "net_test_conn_multiplexing"
-    },
-    {
       "name": "net_test_hci"
     },
     {
       "name": "net_test_stack"
     },
     {
-      "name": "net_test_stack_a2dp_codecs_native"
-    },
-    {
       "name": "net_test_stack_ad_parser"
     },
+    // go/a-unit-tests tests
+    // Thoses test run on the host in the CI automatically.
+    // Run the one that are available on the device on the
+    // device as well
     {
       "name": "bluetooth_csis_test"
     },
     {
-      "name": "bluetooth_flatbuffer_tests"
-    },
-    {
       "name": "bluetooth_groups_test"
     },
     {
@@ -76,13 +64,29 @@
       "name": "bluetooth_le_audio_client_test"
     },
     {
+      "name": "bluetooth_le_audio_codec_manager_test"
+    },
+    {
       "name": "bluetooth_le_audio_test"
     },
     {
+      "name": "bluetooth_packet_parser_test"
+    },
+    {
       "name": "bluetooth_ras_test"
     },
     {
-      "name": "bluetooth_packet_parser_test"
+      "name": "bluetooth-test-audio-hal-a2dp-provider-info"
+    },
+    // Broken
+    //{
+    //  "name": "bluetooth-test-audio-hal-aidl-leaudio-utils"
+    //},
+    {
+      "name": "bluetooth-test-audio-hal-hfp-client-interface"
+    },
+    {
+      "name": "bluetooth-test-audio-hal-le-audio-software"
     },
     {
       "name": "bluetooth_test_broadcaster"
@@ -94,21 +98,55 @@
       "name": "bluetooth_test_common"
     },
     {
+      "name": "bluetooth_test_gd_unit"
+    },
+    {
+      "name": "bluetooth_test_with_timerfd"
+    },
+    {
       "name": "bluetooth_vc_test"
     },
     {
+      "name": "bt_host_test_bta_scn"
+    },
+    {
       "name": "libaptx_enc_tests"
     },
     {
       "name": "libaptxhd_enc_tests"
     },
     {
+      "name": "libbluetooth_core_rs_test"
+    },
+    // Broken
+    //{
+    //  "name": "libbluetooth_log_test"
+    //},
+    {
+      "name": "libbluetooth_offload_hci_test"
+    },
+    {
       "name": "net_test_avrcp"
     },
     {
+      "name": "net_test_bta"
+    },
+    {
+      "name": "net_test_bta_jv"
+    },
+    {
+      "name": "net_test_bta_security"
+    },
+    {
       "name": "net_test_btcore"
     },
     {
+      "name": "net_test_btif"
+    },
+    {
+      "name": "net_test_btif_avrcp_audio_track"
+    },
+    {
       "name": "net_test_btif_hh"
     },
     {
@@ -124,6 +162,9 @@
       "name": "net_test_btpackets"
     },
     {
+      "name": "net_test_conn_multiplexing"
+    },
+    {
       "name": "net_test_eatt"
     },
     {
@@ -139,6 +180,12 @@
       "name": "net_test_stack_acl"
     },
     {
+      "name": "net_test_stack_a2dp_codecs_native"
+    },
+    {
+      "name": "net_test_stack_avctp"
+    },
+    {
       "name": "net_test_stack_avdtp"
     },
     {
@@ -169,6 +216,9 @@
       "name": "net_test_stack_rfcomm"
     },
     {
+      "name": "net_test_stack_rnr"
+    },
+    {
       "name": "net_test_stack_sdp"
     },
     {
@@ -199,7 +249,7 @@
     {
       "name": "ServiceBluetoothTests"
     },
-    // device only tests
+    // Device only tests
     // Broken
     //{
     //  "name": "bluetooth-test-audio-hal-interface"
@@ -211,45 +261,27 @@
       "name": "net_test_bluetooth"
     },
     {
-      "name": "net_test_bta"
-    },
-    {
-      "name": "net_test_bta_security"
-    },
-    {
-      "name": "net_test_btif"
-    },
-    {
       "name": "net_test_btif_hf_client_service"
     },
     {
       "name": "net_test_btif_profile_queue"
     },
     {
-      "name": "net_test_btif_avrcp_audio_track"
-    },
-    {
       "name": "net_test_device"
     },
     {
       "name": "net_test_device_iot_config"
     },
     {
-      "name": "net_test_conn_multiplexing"
-    },
-    {
       "name": "net_test_hci"
     },
     {
       "name": "net_test_stack"
     },
     {
-      "name": "net_test_stack_a2dp_codecs_native"
-    },
-    {
       "name": "net_test_stack_ad_parser"
     },
-    // go/a-unit-tests tests (unit_test: true)
+    // go/a-unit-tests tests
     // Thoses test run on the host in the CI automatically.
     // Run the one that are available on the device on the
     // device as well
@@ -257,9 +289,6 @@
       "name": "bluetooth_csis_test"
     },
     {
-      "name": "bluetooth_flatbuffer_tests"
-    },
-    {
       "name": "bluetooth_groups_test"
     },
     {
@@ -272,13 +301,29 @@
       "name": "bluetooth_le_audio_client_test"
     },
     {
+      "name": "bluetooth_le_audio_codec_manager_test"
+    },
+    {
       "name": "bluetooth_le_audio_test"
     },
     {
+      "name": "bluetooth_packet_parser_test"
+    },
+    {
       "name": "bluetooth_ras_test"
     },
     {
-      "name": "bluetooth_packet_parser_test"
+      "name": "bluetooth-test-audio-hal-a2dp-provider-info"
+    },
+    // Broken
+    //{
+    //  "name": "bluetooth-test-audio-hal-aidl-leaudio-utils"
+    //},
+    {
+      "name": "bluetooth-test-audio-hal-hfp-client-interface"
+    },
+    {
+      "name": "bluetooth-test-audio-hal-le-audio-software"
     },
     {
       "name": "bluetooth_test_broadcaster"
@@ -290,21 +335,55 @@
       "name": "bluetooth_test_common"
     },
     {
+      "name": "bluetooth_test_gd_unit"
+    },
+    {
+      "name": "bluetooth_test_with_timerfd"
+    },
+    {
       "name": "bluetooth_vc_test"
     },
     {
+      "name": "bt_host_test_bta_scn"
+    },
+    {
       "name": "libaptx_enc_tests"
     },
     {
       "name": "libaptxhd_enc_tests"
     },
     {
+      "name": "libbluetooth_core_rs_test"
+    },
+    // Broken
+    //{
+    //  "name": "libbluetooth_log_test"
+    //},
+    {
+      "name": "libbluetooth_offload_hci_test"
+    },
+    {
       "name": "net_test_avrcp"
     },
     {
+      "name": "net_test_bta"
+    },
+    {
+      "name": "net_test_bta_jv"
+    },
+    {
+      "name": "net_test_bta_security"
+    },
+    {
       "name": "net_test_btcore"
     },
     {
+      "name": "net_test_btif"
+    },
+    {
+      "name": "net_test_btif_avrcp_audio_track"
+    },
+    {
       "name": "net_test_btif_hh"
     },
     {
@@ -320,6 +399,9 @@
       "name": "net_test_btpackets"
     },
     {
+      "name": "net_test_conn_multiplexing"
+    },
+    {
       "name": "net_test_eatt"
     },
     {
@@ -335,6 +417,12 @@
       "name": "net_test_stack_acl"
     },
     {
+      "name": "net_test_stack_a2dp_codecs_native"
+    },
+    {
+      "name": "net_test_stack_avctp"
+    },
+    {
       "name": "net_test_stack_avdtp"
     },
     {
@@ -365,6 +453,9 @@
       "name": "net_test_stack_rfcomm"
     },
     {
+      "name": "net_test_stack_rnr"
+    },
+    {
       "name": "net_test_stack_sdp"
     },
     {
@@ -435,14 +526,11 @@
     {
       "name": "net_test_stack_ad_parser"
     },
-    // go/a-unit-tests tests (unit_test: true)
+    // go/a-unit-tests tests
     // Thoses test run on the host in the CI automatically.
     // Run the one that are available on the device on the
     // device as well
     {
-      "name": "bluetooth_flatbuffer_tests"
-    },
-    {
       "name": "bluetooth_le_audio_test"
     },
     {
@@ -481,19 +569,16 @@
   ],
   "postsubmit": [
     {
-      "name": "bluetooth_le_audio_codec_manager_test"
-    },
-    {
-      "name": "bluetooth-test-audio-hal-a2dp-provider-info"
+      "name": "audio_bluetooth_hw_test"
     },
     {
-      "name": "net_test_bta_jv"
+      "name": "bluetooth_audio_hal_version_test"
     },
     {
-      "name": "net_test_stack_avctp"
+      "name": "libbluetooth_offload_leaudio_hci_test"
     },
     {
-      "name": "asrc_resampler_test"
+      "name": "net_test_bta_gatt"
     }
   ]
 }
diff --git a/offload/leaudio/hci/Android.bp b/offload/leaudio/hci/Android.bp
index e4f1b51881..8a9b9247d6 100644
--- a/offload/leaudio/hci/Android.bp
+++ b/offload/leaudio/hci/Android.bp
@@ -42,5 +42,6 @@ rust_library {
 
 rust_test {
     name: "libbluetooth_offload_leaudio_hci_test",
+    test_suites: ["general-tests"],
     defaults: ["bluetooth_offload_leaudio_hci_defaults"],
 }
diff --git a/system/audio_bluetooth_hw/Android.bp b/system/audio_bluetooth_hw/Android.bp
index 030fef1942..fe2a441b78 100644
--- a/system/audio_bluetooth_hw/Android.bp
+++ b/system/audio_bluetooth_hw/Android.bp
@@ -57,6 +57,7 @@ cc_library_shared {
 
 cc_test {
     name: "audio_bluetooth_hw_test",
+    test_suites: ["general-tests"],
     defaults: ["audio_bluetooth_hw_defaults"],
     srcs: [
         "utils.cc",
diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index cc33db9a51..6382757832 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -271,6 +271,7 @@ cc_defaults {
 // Bluetooth Audio client interface library unit tests
 cc_test {
     name: "bluetooth-test-audio-hal-aidl-leaudio-utils",
+    test_suites: ["general-tests"],
     host_supported: true,
     defaults: [
         "fluoride_defaults",
@@ -323,6 +324,7 @@ cc_test {
 // Bluetooth Audio client interface library unit tests
 cc_test {
     name: "bluetooth-test-audio-hal-le-audio-software",
+    test_suites: ["general-tests"],
     host_supported: true,
     defaults: [
         "libbt_audio_hal_interface_test_defaults",
@@ -359,6 +361,7 @@ cc_test {
 // HFP client interface library unit tests
 cc_test {
     name: "bluetooth-test-audio-hal-hfp-client-interface",
+    test_suites: ["general-tests"],
     host_supported: true,
     defaults: [
         "libbt_audio_hal_interface_test_defaults",
diff --git a/system/log/Android.bp b/system/log/Android.bp
index 649a039aff..e0855a2304 100644
--- a/system/log/Android.bp
+++ b/system/log/Android.bp
@@ -33,6 +33,7 @@ cc_library {
 
 cc_test {
     name: "libbluetooth_log_test",
+    test_suites: ["general-tests"],
     host_supported: true,
     srcs: [
         "src/truncating_buffer_test.cc",