diff --git a/libc/Android.bp b/libc/Android.bp
index 6b46ba0..ad9ffbf 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1623,9 +1623,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: {