diff --git a/Android.bp b/Android.bp
index 5f54695..dbdb2f3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -120,14 +120,9 @@
 // libunwind shared and static library
 //-----------------------------------------------------------------------
 
-cc_library {
-    name: "libunwind",
+cc_defaults {
+    name: "libunwind_core_defaults",
     defaults: ["libunwind_defaults"],
-    vendor_available: false,
-    vndk: {
-        enabled: true,
-        support_system_process: true,
-    },
     sdk_version: "21",
     stl: "none",
 
@@ -419,6 +414,17 @@
     },
 }
 
+cc_library_shared {
+    name: "libunwind",
+    defaults: ["libunwind_core_defaults"],
+}
+
+cc_library_static {
+    name: "libunwind_static",
+    defaults: ["libunwind_core_defaults"],
+    vendor_available: true,
+}
+
 //-----------------------------------------------------------------------
 // libunwindbacktrace static library
 //-----------------------------------------------------------------------