commit d9cd29ae14661ffe7f12f5046dfab779ea96d987
author Dan Willemsen <dwillemsen@google.com> Mon Dec 03 22:30:44 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 03 22:30:44 2018 -0800
tree 8cfb8a05a89199fdaf84dca8bfc953fddcb4a06b
parent 6b16fcc713ecaeb83717ae6a520f61ab04be9191
parent c69218d47ed3f915357fb3782dd0a528efc745e5

Merge "Prevent dependency cycle due to system_shared_libs expansion"
am: c69218d47e

Change-Id: I709db052bd477637106d4469636f8cf6eddbac13

Android.bp

diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index b44c296..0000000
--- a/Android.bp
+++ /dev/null
@@ -1 +0,0 @@
-subdirs = ["*"]

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 2a2c763..ec0749f 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1622,9 +1622,15 @@
     ],
     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

diff --git a/libdl/Android.bp b/libdl/Android.bp
index 13c8714..656d3ab 100644
--- a/libdl/Android.bp
+++ b/libdl/Android.bp
@@ -22,6 +22,7 @@
     include_dirs: ["bionic/libc"],
 
     stl: "none",
+    system_shared_libs: [],
 
     sanitize: {
         never: true,

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index a9907ca..0e3484a 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -283,6 +283,7 @@
             suffix: "64",
         },
     },
+    system_shared_libs: [],
     target: {
         android: {
             static_libs: ["libdebuggerd_handler_fallback"],