Merge QP1A.190107.001
Change-Id: Ia807d68d67a9daeeb2eaa89cf07cb1065b373482
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
//-----------------------------------------------------------------------
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..71454ad
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,8 @@
+# Default owners are top 3 active developers of the past 1 or 2 years
+# or people with more than 10 commits last year.
+# Please update this list if you find better owner candidates.
+cferris@google.com
+dwillemsen@google.com
+justinyun@google.com
+ccross@android.com
+enh@google.com