Merge "Prevent dependency cycle due to system_shared_libs expansion"

Android.bp

@@ -1 +0,0 @@
-subdirs = ["*"]

libc/Android.bp

@@ -1622,9 +1622,15 @@ cc_library {
     ],
     name: "libstdc++",
     static_ndk_lib: true,
-    system_shared_libs: ["libc"],
     static_libs: ["libasync_safe"],
 
+    static: {
+        system_shared_libs: [],
+    },
+    shared: {
+        system_shared_libs: ["libc"],
+    },
+
     //TODO (dimitry): This is to work around b/24465209. Remove after root cause is fixed
     arch: {
         arm: {

libdl/Android.bp

@@ -22,6 +22,7 @@ cc_library_static {
     include_dirs: ["bionic/libc"],
 
     stl: "none",
+    system_shared_libs: [],
 
     sanitize: {
         never: true,

linker/Android.bp

@@ -283,6 +283,7 @@ cc_binary {
             suffix: "64",
         },
     },
+    system_shared_libs: [],
     target: {
         android: {
             static_libs: ["libdebuggerd_handler_fallback"],