Revert^2 "Run GTests with ASAN on 32bit only"

95ced0c74f790d8083dfce78fa034d83c0aa7b03

Change-Id: Ie9b3c8511fb8c18203cc98f4bee8c427824bd897

1 files changed, 24 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 521a562865..6f988c8cc0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,3 +67,27 @@ filegroup {
         "AndroidTestTemplate.xml",
     ],
 }
+
+filegroup {
+    name: "BluetoothGTestForce32ConfigTemplate",
+    srcs: [
+        "AndroidGTestForce32Template.xml",
+    ],
+}
+
+// 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,
+        },
+    },
+}