Remove ASAN workaround

The underlying issue seems to have been fixed

Bug: 154347133
Fix: 308547175
Test: N/A
Change-Id: I8ca8a8c5328c876b6410f8a4c85f614d5feafb89

21 files changed, 0 insertions, 129 deletions

diff --git a/Android.bp b/Android.bp
index 2f8cf54d61..d585c6c9ca 100644
--- a/Android.bp
+++ b/Android.bp
@@ -38,13 +38,6 @@ filegroup {
     ],
 }
 
-filegroup {
-    name: "BluetoothGTestForce32ConfigTemplate",
-    srcs: [
-        "AndroidGTestForce32Template.xml",
-    ],
-}
-
 // This default contains properties that should be common to all the cc targets
 // developed by the Bluetooth team.
 //
@@ -79,20 +72,3 @@ cc_defaults {
     c_std: "c99",
     cpp_std: "c++17",
 }
-
-// Address Sanitizer is flaky on Android x86_64 binaries but it's not on x86
-// binaries.
-// This default workaround the x86_64 ASAN flakyness by running 32bit binaries
-// on 64bit targets.
-// TODO(b/154347133): Remove this workaround
-cc_defaults {
-    name: "bluetooth_gtest_x86_asan_workaround",
-    target: {
-        android_x86: {
-            test_config_template: ":BluetoothGTestForce32ConfigTemplate",
-        },
-        android_x86_64: {
-            enabled: false,
-        },
-    },
-}
diff --git a/AndroidGTestForce32Template.xml b/AndroidGTestForce32Template.xml
deleted file mode 100644
index bad033a293..0000000000
--- a/AndroidGTestForce32Template.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Runs {MODULE}.">
-  <option name="test-suite-tag" value="apct" />
-  <option name="test-suite-tag" value="apct-native" />
-  <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
-  <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
-        <option name="cleanup" value="true" />
-        <option name="push" value="{MODULE}32->/data/local/tmp/{MODULE}" />
-    </target_preparer>
-  <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
-    <option name="run-command" value="settings put global ble_scan_always_enabled 0" />
-    <option name="run-command" value="cmd bluetooth_manager disable" />
-    <option name="run-command" value="cmd bluetooth_manager wait-for-state:STATE_OFF" />
-  </target_preparer>
-  <target_preparer class="com.android.tradefed.targetprep.FolderSaver">
-    <option name="device-path" value="/data/vendor/ssrdump" />
-  </target_preparer>
-  <test class="com.android.tradefed.testtype.GTest" >
-    <option name="native-test-device-path" value="/data/local/tmp" />
-    <option name="module-name" value="{MODULE}" />
-    <option name="run-test-as" value="0" />
-  </test>
-
-  <!-- Only run tests in MTS if the Bluetooth Mainline module is installed. -->
-  <object type="module_controller"
-          class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-      <option name="mainline-module-package-name" value="com.android.btservices" />
-      <option name="mainline-module-package-name" value="com.google.android.btservices" />
-  </object>
-</configuration>
diff --git a/system/audio_a2dp_hw/Android.bp b/system/audio_a2dp_hw/Android.bp
index 2d863902e8..d75554928d 100644
--- a/system/audio_a2dp_hw/Android.bp
+++ b/system/audio_a2dp_hw/Android.bp
@@ -61,7 +61,6 @@ cc_test {
     test_suites: ["general-tests"],
     defaults: [
         "audio_a2dp_hw_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
         "mts_defaults",
     ],
     srcs: [
diff --git a/system/audio_hearing_aid_hw/Android.bp b/system/audio_hearing_aid_hw/Android.bp
index f4d451160a..920bfa7a0b 100644
--- a/system/audio_hearing_aid_hw/Android.bp
+++ b/system/audio_hearing_aid_hw/Android.bp
@@ -43,7 +43,6 @@ cc_test {
     test_suites: ["general-tests"],
     defaults: [
         "audio_hearing_aid_hw_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
         "mts_defaults",
     ],
     srcs: [
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index c9a7c4496d..66073d7398 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -215,7 +215,6 @@ cc_library_static {
 cc_test {
     name: "net_test_bta",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
     ],
@@ -273,7 +272,6 @@ cc_test {
 cc_test {
     name: "net_test_bta_gatt",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
     ],
@@ -365,7 +363,6 @@ cc_test {
 cc_test {
     name: "bt_host_test_bta",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
     ],
@@ -501,7 +498,6 @@ cc_test {
 cc_test {
     name: "bt_host_test_bta_scn",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
     ],
@@ -567,7 +563,6 @@ cc_test {
     name: "bluetooth_csis_test",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
     ],
@@ -628,7 +623,6 @@ cc_test {
     name: "bluetooth_groups_test",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
     ],
@@ -676,7 +670,6 @@ cc_test {
     name: "bluetooth_vc_test",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
     ],
@@ -802,7 +795,6 @@ cc_test {
     name: "bluetooth_le_audio_codec_manager_test",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -878,7 +870,6 @@ cc_test {
     name: "bluetooth_le_audio_test",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1088,7 +1079,6 @@ cc_test {
     name: "bluetooth_test_broadcaster_state_machine",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
     ],
@@ -1146,7 +1136,6 @@ cc_test {
     name: "bluetooth_test_broadcaster",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
     ],
@@ -1216,7 +1205,6 @@ cc_test {
     name: "bluetooth_has_test",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
     ],
@@ -1278,7 +1266,6 @@ cc_test {
     name: "bluetooth_hh_test",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
     ],
diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp
index 2436c72e3f..02e25de69e 100644
--- a/system/btcore/Android.bp
+++ b/system/btcore/Android.bp
@@ -88,7 +88,6 @@ cc_test {
     name: "net_test_btcore",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 56a8513af1..56277c4b25 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -257,7 +257,6 @@ cc_library_static {
 cc_test {
     name: "net_test_btif",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "latest_android_hardware_audio_common_ndk_static",
         "latest_android_hardware_bluetooth_audio_ndk_static",
@@ -340,7 +339,6 @@ cc_test {
 cc_test {
     name: "net_test_btif_profile_queue",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -373,7 +371,6 @@ cc_test {
 cc_test {
     name: "net_test_btif_avrcp_audio_track",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -409,7 +406,6 @@ cc_test {
 cc_test {
     name: "net_test_btif_rc",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -461,7 +457,6 @@ cc_test {
 cc_test {
     name: "net_test_btif_config_cache",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -504,7 +499,6 @@ cc_test {
 cc_test {
     name: "net_test_btif_hf_client_service",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -539,7 +533,6 @@ cc_test {
     name: "net_test_btif_hh",
     host_supported: true,
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "latest_android_hardware_audio_common_ndk_static",
         "latest_android_hardware_bluetooth_audio_ndk_static",
@@ -678,7 +671,6 @@ cc_test {
     name: "net_test_btif_stack",
     host_supported: true,
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "latest_android_hardware_audio_common_ndk_static",
         "latest_android_hardware_bluetooth_audio_ndk_static",
diff --git a/system/common/Android.bp b/system/common/Android.bp
index 9e58054b2c..6956c3478b 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -64,7 +64,6 @@ cc_test {
     name: "bluetooth_test_common",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -119,7 +118,6 @@ cc_test {
 cc_test {
     name: "net_test_performance",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 41cfcaf606..81ab4295de 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -41,7 +41,6 @@ cc_test {
     name: "net_test_device",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -71,7 +70,6 @@ cc_test {
     name: "net_test_device_iot_config",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
diff --git a/system/embdrv/tests/Android.bp b/system/embdrv/tests/Android.bp
index 6e53b1b0f3..6b06547e9d 100644
--- a/system/embdrv/tests/Android.bp
+++ b/system/embdrv/tests/Android.bp
@@ -10,7 +10,6 @@ package {
 cc_test {
     name: "libaptx_enc_tests",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "mts_defaults",
     ],
     test_suites: ["general-tests"],
@@ -30,7 +29,6 @@ cc_test {
 cc_test {
     name: "libaptxhd_enc_tests",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "mts_defaults",
     ],
     test_suites: ["general-tests"],
diff --git a/system/gd/Android.bp b/system/gd/Android.bp
index 854335252d..b9557a16ac 100644
--- a/system/gd/Android.bp
+++ b/system/gd/Android.bp
@@ -338,7 +338,6 @@ cc_test {
     name: "bluetooth_test_gd_unit",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "gd_defaults",
         "mts_defaults",
     ],
@@ -442,7 +441,6 @@ cc_test {
     name: "bluetooth_packet_parser_test",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "gd_defaults",
         "mts_defaults",
     ],
diff --git a/system/gd/dumpsys/Android.bp b/system/gd/dumpsys/Android.bp
index 4efa408393..085c44b7f9 100644
--- a/system/gd/dumpsys/Android.bp
+++ b/system/gd/dumpsys/Android.bp
@@ -196,7 +196,6 @@ cc_test {
     test_suites: ["general-tests"],
     defaults: [
         "bluetooth_cflags",
-        "bluetooth_gtest_x86_asan_workaround",
         "mts_defaults",
     ],
     host_supported: true,
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index 4b3b1c8baa..57de073e88 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -44,7 +44,6 @@ cc_test {
     name: "net_test_hci",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
diff --git a/system/main/Android.bp b/system/main/Android.bp
index d81aa88b39..55cad1aea1 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -167,7 +167,6 @@ cc_test {
         unit_test: true,
     },
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
diff --git a/system/osi/Android.bp b/system/osi/Android.bp
index f04fd56b55..8171a56a1d 100644
--- a/system/osi/Android.bp
+++ b/system/osi/Android.bp
@@ -103,7 +103,6 @@ cc_test {
     name: "net_test_osi",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_osi_defaults",
         "mts_defaults",
     ],
diff --git a/system/packet/Android.bp b/system/packet/Android.bp
index cf2f68d56f..2bf4f01828 100644
--- a/system/packet/Android.bp
+++ b/system/packet/Android.bp
@@ -28,7 +28,6 @@ cc_library_static {
 cc_test {
     name: "net_test_btpackets",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index 4bbc6bae08..bd4380b4b8 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -48,7 +48,6 @@ cc_test {
     name: "net_test_avrcp",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
diff --git a/system/profile/sdp/Android.bp b/system/profile/sdp/Android.bp
index 8068972343..a076f462f9 100644
--- a/system/profile/sdp/Android.bp
+++ b/system/profile/sdp/Android.bp
@@ -31,7 +31,6 @@ cc_test {
     name: "bluetooth_test_sdp",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index e9f5c0d5c3..5f57faa8b7 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -670,7 +670,6 @@ cc_fuzz {
 cc_test {
     name: "net_test_stack",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "latest_android_hardware_audio_common_ndk_static",
         "latest_android_hardware_bluetooth_audio_ndk_shared",
@@ -752,7 +751,6 @@ cc_test {
 cc_test {
     name: "net_test_stack_rfcomm",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -839,7 +837,6 @@ cc_test {
 cc_test {
     name: "net_test_stack_smp",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -912,7 +909,6 @@ cc_test {
 cc_test {
     name: "net_test_stack_ad_parser",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -939,7 +935,6 @@ cc_test {
 cc_test {
     name: "net_test_gatt_conn_multiplexing",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -985,7 +980,6 @@ cc_test {
 cc_test {
     name: "net_test_stack_gatt_native",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1050,7 +1044,6 @@ cc_test {
 cc_test {
     name: "net_test_stack_avdtp",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1117,7 +1110,6 @@ cc_test {
 cc_test {
     name: "net_test_stack_a2dp_codecs_native",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1233,7 +1225,6 @@ cc_test {
 cc_test {
     name: "net_test_stack_a2dp_native",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1277,7 +1268,6 @@ cc_test {
 cc_test {
     name: "net_test_stack_gatt_sr_hash_native",
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1345,7 +1335,6 @@ cc_test {
         unit_test: true,
     },
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1398,7 +1387,6 @@ cc_test {
         unit_test: true,
     },
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1465,7 +1453,6 @@ cc_test {
         unit_test: true,
     },
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1592,7 +1579,6 @@ cc_test {
     test_suites: ["general-tests"],
     host_supported: true,
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1640,7 +1626,6 @@ cc_test {
     test_suites: ["general-tests"],
     host_supported: true,
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1707,7 +1692,6 @@ cc_test {
     test_suites: ["general-tests"],
     host_supported: true,
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1778,7 +1762,6 @@ cc_test {
     test_suites: ["general-tests"],
     host_supported: true,
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1872,7 +1855,6 @@ cc_test {
     test_suites: ["general-tests"],
     host_supported: true,
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -1961,7 +1943,6 @@ cc_test {
     test_suites: ["general-tests"],
     host_supported: true,
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
@@ -2048,7 +2029,6 @@ cc_test {
     test_suites: ["general-tests"],
     host_supported: true,
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 95bea9ff75..1fd608b022 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -106,7 +106,6 @@ cc_test {
     name: "net_test_bluetooth",
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "latest_android_hardware_audio_common_ndk_static",
         "latest_android_hardware_bluetooth_audio_ndk_static",
         "latest_android_media_audio_common_types_ndk_static",
diff --git a/system/types/Android.bp b/system/types/Android.bp
index 9acf5b44c2..e556f8e5f2 100644
--- a/system/types/Android.bp
+++ b/system/types/Android.bp
@@ -63,7 +63,6 @@ cc_test {
     ],
     test_suites: ["general-tests"],
     defaults: [
-        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
     ],