Merge "Move system_shared_libs into target.bionic clause" am: 2ffa0eb7d3

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1764658

Change-Id: I0b2facf4a49d0683683be9ba12f5f975fa7018b5

libc/Android.bp

@@ -1978,9 +1978,13 @@ cc_library {
     static: {
         system_shared_libs: [],
     },
+    target: {
+        bionic: {
             shared: {
                 system_shared_libs: ["libc"],
             },
+        },
+    },
 
     //TODO (dimitry): This is to work around b/24465209. Remove after root cause is fixed
     arch: {

libm/Android.bp

@@ -509,7 +509,11 @@ cc_library {
     tidy_checks: ["-cert-dcl16-c"],
 
     include_dirs: ["bionic/libc"],
+    target: {
+        bionic: {
             system_shared_libs: ["libc"],
+        },
+    },
 
     sanitize: {
         address: false,