Move native test to native code change only

Bug: 311772251
Flag: TEST_ONLY
Test: m .
Change-Id: I8d4cb75223fa302133d3f257de797d4dab9e53ad
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 0b2124a..100b44b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,3 +1,7 @@
+// See go/a-unit-tests
+// Some tests are device only.
+// Some tests are host enabled and run in the CI automatically. But we still
+// want to run them on device too
 {
   "bt-mainline-presubmit": [
     { "name": "CtsBluetoothTestCases" },
@@ -5,11 +9,6 @@
     { "name": "GoogleBluetoothInstrumentationTests" },
     { "name": "FrameworkBluetoothTests" },
     { "name": "ServiceBluetoothTests" },
-    // Device only tests
-    // go/a-unit-tests tests
-    // These tests 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_groups_test" },
     { "name": "bluetooth_has_test" },
@@ -30,40 +29,7 @@
     { "name": "libaptxhd_enc_tests" },
     { "name": "libbluetooth_core_rs_test" },
     { "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_btif" },
-    { "name": "net_test_btif_avrcp_audio_track" },
-    { "name": "net_test_btif_hh" },
-    { "name": "net_test_btif_rc" },
-    { "name": "net_test_btif_stack" },
-    { "name": "net_test_btm_iso" },
-    { "name": "net_test_btpackets" },
-    { "name": "net_test_conn_multiplexing" },
-    { "name": "net_test_eatt" },
-    { "name": "net_test_main_shim" },
-    { "name": "net_test_osi" },
-    { "name": "net_test_performance" },
-    { "name": "net_test_stack_acl" },
-    { "name": "net_test_stack_a2dp_codecs_native" },
-    { "name": "net_test_stack_avctp" },
-    { "name": "net_test_stack_avdtp" },
-    { "name": "net_test_stack_btm" },
-    { "name": "net_test_stack_btu" },
-    { "name": "net_test_stack_gatt" },
-    { "name": "net_test_stack_gatt_native" },
-    { "name": "net_test_stack_gatt_sr_hash_native" },
-    { "name": "net_test_stack_hci" },
-    { "name": "net_test_stack_hid" },
-    { "name": "net_test_stack_l2cap" },
-    { "name": "net_test_stack_rfcomm" },
-    { "name": "net_test_stack_rnr" },
-    { "name": "net_test_stack_sdp" },
-    { "name": "net_test_stack_smp" },
-    { "name": "net_test_types" }
+    { "name": "libbluetooth_offload_hci_test" }
   ],
   "presubmit": [
     // android_test targets
@@ -77,11 +43,6 @@
     },
     { "name": "FrameworkBluetoothTests" },
     { "name": "ServiceBluetoothTests" },
-    // Device only tests
-    // go/a-unit-tests tests
-    // These tests 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_groups_test" },
     { "name": "bluetooth_has_test" },
@@ -102,70 +63,17 @@
     { "name": "libaptxhd_enc_tests" },
     { "name": "libbluetooth_core_rs_test" },
     { "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_btif" },
-    { "name": "net_test_btif_avrcp_audio_track" },
-    { "name": "net_test_btif_hh" },
-    { "name": "net_test_btif_rc" },
-    { "name": "net_test_btif_stack" },
-    { "name": "net_test_btm_iso" },
-    { "name": "net_test_btpackets" },
-    { "name": "net_test_conn_multiplexing" },
-    { "name": "net_test_eatt" },
-    { "name": "net_test_main_shim" },
-    { "name": "net_test_osi" },
-    { "name": "net_test_performance" },
-    { "name": "net_test_stack_acl" },
-    { "name": "net_test_stack_a2dp_codecs_native" },
-    { "name": "net_test_stack_avctp" },
-    { "name": "net_test_stack_avdtp" },
-    { "name": "net_test_stack_btm" },
-    { "name": "net_test_stack_btu" },
-    { "name": "net_test_stack_gatt" },
-    { "name": "net_test_stack_gatt_native" },
-    { "name": "net_test_stack_gatt_sr_hash_native" },
-    { "name": "net_test_stack_hci" },
-    { "name": "net_test_stack_hid" },
-    { "name": "net_test_stack_l2cap" },
-    { "name": "net_test_stack_rfcomm" },
-    { "name": "net_test_stack_rnr" },
-    { "name": "net_test_stack_sdp" },
-    { "name": "net_test_stack_smp" },
-    { "name": "net_test_types" }
+    { "name": "libbluetooth_offload_hci_test" }
   ],
   "hwasan-presubmit": [
-    // android_test targets
     { "name": "CtsBluetoothTestCases" },
     { "name": "BluetoothJavaUnitTests" },
     { "name": "BluetoothInstrumentationTests" },
     { "name": "GoogleBluetoothInstrumentationTests" },
     { "name": "FrameworkBluetoothTests" },
     { "name": "ServiceBluetoothTests" },
-    // device only tests
-    { "name": "net_test_bta" },
-    { "name": "net_test_bta_security" },
-    { "name": "net_test_btif" },
-    { "name": "net_test_btif_avrcp_audio_track" },
-    { "name": "net_test_conn_multiplexing" },
-    // go/a-unit-tests tests
-    // These tests run on the host in the CI automatically.
-    // Run the one that are available on the device on the
-    // device as well
     { "name": "bluetooth_test_common" },
-    { "name": "bluetooth_vc_test" },
-    { "name": "net_test_avrcp" },
-    { "name": "net_test_btpackets" },
-    { "name": "net_test_eatt" },
-    { "name": "net_test_performance" },
-    { "name": "net_test_stack_gatt_sr_hash_native" },
-    { "name": "net_test_stack_rfcomm" },
-    { "name": "net_test_stack_sdp" },
-    { "name": "net_test_stack_smp" },
-    { "name": "net_test_types" }
+    { "name": "bluetooth_vc_test" }
   ],
   "postsubmit": [
     { "name": "audio_bluetooth_hw_test" },
diff --git a/system/TEST_MAPPING b/system/TEST_MAPPING
index f191581..cb8678c 100644
--- a/system/TEST_MAPPING
+++ b/system/TEST_MAPPING
@@ -6,43 +6,123 @@
     { "name": "bluetooth_le_audio_codec_manager_test" },
     { "name": "bluetooth_le_audio_test" },
     { "name": "bluetooth_test_gd_unit" },
+    { "name": "net_test_avrcp" },
     { "name": "net_test_bluetooth" },
+    { "name": "net_test_bta" },
+    { "name": "net_test_bta_jv" },
+    { "name": "net_test_bta_security" },
+    { "name": "net_test_btif" },
+    { "name": "net_test_btif_avrcp_audio_track" },
     { "name": "net_test_btif_hf_client_service" },
+    { "name": "net_test_btif_hh" },
     { "name": "net_test_btif_profile_queue" },
+    { "name": "net_test_btif_rc" },
+    { "name": "net_test_btif_stack" },
+    { "name": "net_test_btm_iso" },
+    { "name": "net_test_btpackets" },
+    { "name": "net_test_conn_multiplexing" },
     { "name": "net_test_device" },
     { "name": "net_test_device_iot_config" },
+    { "name": "net_test_eatt" },
     { "name": "net_test_hci" },
+    { "name": "net_test_main_shim" },
+    { "name": "net_test_osi" },
+    { "name": "net_test_performance" },
     { "name": "net_test_stack" },
-    { "name": "net_test_stack_ad_parser" }
+    { "name": "net_test_stack_a2dp_codecs_native" },
+    { "name": "net_test_stack_acl" },
+    { "name": "net_test_stack_ad_parser" },
+    { "name": "net_test_stack_avctp" },
+    { "name": "net_test_stack_avdtp" },
+    { "name": "net_test_stack_btm" },
+    { "name": "net_test_stack_btu" },
+    { "name": "net_test_stack_gatt" },
+    { "name": "net_test_stack_gatt_native" },
+    { "name": "net_test_stack_gatt_sr_hash_native" },
+    { "name": "net_test_stack_hci" },
+    { "name": "net_test_stack_hid" },
+    { "name": "net_test_stack_l2cap" },
+    { "name": "net_test_stack_rfcomm" },
+    { "name": "net_test_stack_rnr" },
+    { "name": "net_test_stack_sdp" },
+    { "name": "net_test_stack_smp" },
+    { "name": "net_test_types" }
   ],
   "presubmit": [
     { "name": "bluetooth_le_audio_client_test" },
     { "name": "bluetooth_le_audio_codec_manager_test" },
     { "name": "bluetooth_le_audio_test" },
     { "name": "bluetooth_test_gd_unit" },
+    { "name": "net_test_avrcp" },
     { "name": "net_test_bluetooth" },
+    { "name": "net_test_bta" },
+    { "name": "net_test_bta_jv" },
+    { "name": "net_test_bta_security" },
+    { "name": "net_test_btif" },
+    { "name": "net_test_btif_avrcp_audio_track" },
     { "name": "net_test_btif_hf_client_service" },
+    { "name": "net_test_btif_hh" },
     { "name": "net_test_btif_profile_queue" },
+    { "name": "net_test_btif_rc" },
+    { "name": "net_test_btif_stack" },
+    { "name": "net_test_btm_iso" },
+    { "name": "net_test_btpackets" },
+    { "name": "net_test_conn_multiplexing" },
     { "name": "net_test_device" },
     { "name": "net_test_device_iot_config" },
+    { "name": "net_test_eatt" },
     { "name": "net_test_hci" },
+    { "name": "net_test_main_shim" },
+    { "name": "net_test_osi" },
+    { "name": "net_test_performance" },
     { "name": "net_test_stack" },
-    { "name": "net_test_stack_ad_parser" }
+    { "name": "net_test_stack_a2dp_codecs_native" },
+    { "name": "net_test_stack_acl" },
+    { "name": "net_test_stack_ad_parser" },
+    { "name": "net_test_stack_avctp" },
+    { "name": "net_test_stack_avdtp" },
+    { "name": "net_test_stack_btm" },
+    { "name": "net_test_stack_btu" },
+    { "name": "net_test_stack_gatt" },
+    { "name": "net_test_stack_gatt_native" },
+    { "name": "net_test_stack_gatt_sr_hash_native" },
+    { "name": "net_test_stack_hci" },
+    { "name": "net_test_stack_hid" },
+    { "name": "net_test_stack_l2cap" },
+    { "name": "net_test_stack_rfcomm" },
+    { "name": "net_test_stack_rnr" },
+    { "name": "net_test_stack_sdp" },
+    { "name": "net_test_stack_smp" },
+    { "name": "net_test_types" }
   ],
   "hwasan-presubmit": [
-    { "name": "bluetooth_le_audio_test" },
-    { "name": "sdp-fuzzer-validation-test" },
-    { "name": "gatt-fuzzer-validation-test" },
-    { "name": "smp-fuzzer-validation-test" },
     { "name": "avrc-fuzzer-validation-test" },
+    { "name": "bluetooth_le_audio_test" },
     { "name": "bnep-fuzzer-validation-test" },
+    { "name": "gatt-fuzzer-validation-test" },
     { "name": "l2cap-fuzzer-validation-test" },
+    { "name": "net_test_avrcp" },
     { "name": "net_test_bluetooth" },
+    { "name": "net_test_bta" },
+    { "name": "net_test_bta_security" },
+    { "name": "net_test_btif" },
+    { "name": "net_test_btif_avrcp_audio_track" },
     { "name": "net_test_btif_hf_client_service" },
     { "name": "net_test_btif_profile_queue" },
+    { "name": "net_test_btpackets" },
+    { "name": "net_test_conn_multiplexing" },
     { "name": "net_test_device" },
     { "name": "net_test_device_iot_config" },
+    { "name": "net_test_eatt" },
+    { "name": "net_test_performance" },
     { "name": "net_test_stack" },
-    { "name": "net_test_stack_ad_parser" }
+    { "name": "net_test_stack_ad_parser" },
+    { "name": "net_test_stack_gatt_sr_hash_native" },
+    { "name": "net_test_stack_rfcomm" },
+    { "name": "net_test_stack_sdp" },
+    { "name": "net_test_stack_smp" },
+    { "name": "net_test_types" },
+    { "name": "sdp-fuzzer-validation-test" },
+    { "name": "smp-fuzzer-validation-test" }
   ]
 }