From 74985fccfbed1804657923b722fcba8b6f31963c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 2 Feb 2022 13:38:12 -0800
Subject: Only clear system_shared_libs when building for bionic

arm-optimized-routines is included in bionic, so it sets
system_shared_libs to empty to avoid a circular dependency.
Clear system_shared_libs only when compiling for bionic so that
the host tests can compile against musl.

Bug: 190084016
Test: m USE_HOST_MUSL=true host-native
Change-Id: I6915c45bb271683f04c2a5cbf9cbcfa2e332faba
---
 Android.bp | 10 +++++++---
 1 file changed, 7 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 {
-- 
cgit v1.2.3


From e952db49e3ecb47116a39ee5922172e95838699e Mon Sep 17 00:00:00 2001
From: Florian Mayer <fmayer@google.com>
Date: Fri, 18 Mar 2022 15:49:54 -0700
Subject: Add arm-optimized-routines to hwasan-postsubmit

Test: Run tests under HWASan.
Bug: 193568145
Change-Id: I2f87f5f504516789480ba9eef59a67fa9c88e8e4
---
 TEST_MAPPING | 8 ++++++++
 1 file changed, 8 insertions(+)

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"
+    }
   ]
 }
-- 
cgit v1.2.3