Remove libunwind from VNDK
libunwind in VNDK is no longer used by vendor modules. So we may
remove it from VNDK.
However, there are still some vendor modules that are using static
variant of libunwind. For those vendor modules, we define
libunwind_static and make it available to vendor.
Bug: 120948701
Test: build and boot
Change-Id: I2678d94a60703a35d3bc6aad8b20a86f72e67913
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
//-----------------------------------------------------------------------
