diff --git a/libc/Android.bp b/libc/Android.bp
index 6d2390f..fd14aea 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1952,7 +1952,7 @@
 // libstdc++.so and libstdc++.a.
 // ========================================================
 
-cc_library {
+cc_defaults {
     defaults: ["libc_defaults"],
     include_dirs: ["bionic/libstdc++/include"],
     srcs: [
@@ -1960,13 +1960,12 @@
         "bionic/__cxa_pure_virtual.cpp",
         "bionic/new.cpp",
     ],
-    name: "libstdc++",
+    name: "libstdc++_defaults",
     static_ndk_lib: true,
     static_libs: ["libasync_safe"],
     apex_available: [
         "//apex_available:platform",
     ],
-    vendor_available: true,
 
     static: {
         system_shared_libs: [],
@@ -2004,6 +2003,17 @@
     },
 }
 
+cc_library {
+    name: "libstdc++",
+    defaults: ["libstdc++_defaults"],
+}
+
+cc_library_shared {
+    name: "libstdc++_vendor",
+    defaults: ["libstdc++_defaults"],
+    vendor: true,
+}
+
 genrule {
     name: "libstdc++.arm.map",
     out: ["libstdc++.arm.map.txt"],