Merge "Remove asan variants of tests" into main am: 9f4f7848e0

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NeuralNetworks/+/2768515

Change-Id: I28464ae207c40ecc3e8afe96d1f3793d955c4f87
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/runtime/test/Android.bp b/runtime/test/Android.bp
index d29adf0..bcdb10d 100644
--- a/runtime/test/Android.bp
+++ b/runtime/test/Android.bp
@@ -423,19 +423,6 @@
 
 // Temporarily disabled due to b/139889855.
 cc_test {
-    name: "NeuralNetworksTest_static_asan",
-    host_supported: false,
-    defaults: ["NeuralNetworksTest_static_defaults"],
-    enabled: false,
-    sanitize: {
-        address: true,
-    },
-    // Declare explicit library dependency for continuous builds
-    required: ["libclang_rt.asan"],
-}
-
-// Temporarily disabled due to b/139889855.
-cc_test {
     name: "NeuralNetworksTest_static_ubsan",
     host_supported: false,
     defaults: ["NeuralNetworksTest_static_defaults"],
@@ -490,17 +477,6 @@
     defaults: ["NeuralNetworksTest_mt_defaults"],
 }
 
-// Temporarily disabled due to b/139889855.
-cc_test {
-    // Note: tsan not supported on Android (yet)
-    name: "NeuralNetworksTest_mt_static_asan",
-    defaults: ["NeuralNetworksTest_mt_defaults"],
-    enabled: false,
-    sanitize: {
-        address: true,
-    },
-}
-
 cc_library_static {
     name: "CtsNNAPITests_static",
     host_supported: true,