Snap for 8570526 from 9485a5b672d41e03079e2529dfe0f78359b5c2b0 to mainline-scheduling-releaseaml_sch_331113000aml_sch_331111000android13-mainline-scheduling-release

Change-Id: Id8b8f64538312ef7a93fca133c84d812ebe66a18

2 files changed, 15 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index ba814eb..8fe656e 100755
--- a/Android.bp
+++ b/Android.bp
@@ -56,10 +56,14 @@ cc_defaults {
     ],
 
     stl: "none",
-    static: {
-        system_shared_libs: [],
+    target: {
+        bionic: {
+            static: {
+                system_shared_libs: [],
+            },
+            header_libs: ["libc_headers"],
+        },
     },
-    header_libs: ["libc_headers"],
 }
 
 cc_library_static {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 66bdc01..75ec323 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -6,5 +6,13 @@
     {
       "name": "arm-optimized-routines-tests"
     }
+  ],
+  "hwasan-postsubmit": [
+    {
+      "name": "CtsBionicTestCases"
+    },
+    {
+      "name": "arm-optimized-routines-tests"
+    }
   ]
 }