commit 81d80fa9d2e25470fa7dbc2ceb1f57f3cd59cf77
author Colin Cross <ccross@android.com> Thu Feb 03 20:04:52 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 03 20:04:52 2022 +0000
tree 03e74638e3422e83916503a2a2b1a8619551c12b
parent 28068fcbdc8dd9d8e5b2b33eab58454f7c907fba
parent 7621d7701f7c47e14bbd28a6c9540f5dce80a22e

Only clear system_shared_libs when building for bionic am: 74985fccfb am: 293b5a5bc8 am: c4df296ad5 am: 7621d7701f

Original change: https://android-review.googlesource.com/c/platform/external/arm-optimized-routines/+/1968802

Change-Id: I9174171f2ae0726057235d73e2a173a7aa2a04c6

Android.bp

diff --git a/Android.bp b/Android.bp
index ba814eb..8fe656e 100755
--- a/Android.bp
+++ b/Android.bp
@@ -56,10 +56,14 @@
     ],
 
     stl: "none",
-    static: {
-        system_shared_libs: [],
+    target: {
+        bionic: {
+            static: {
+                system_shared_libs: [],
+            },
+            header_libs: ["libc_headers"],
+        },
     },
-    header_libs: ["libc_headers"],
 }
 
 cc_library_static {