libunwind is not directly available to vendors

This lib is behind libbacktrace which is again behind libutils.so. This
lib is a member of VNDK but is not intented to be used directly by
vendors.

Furthermore, libunwindbacktrace no longer includes libunwind. This is
because libunwindbacktrace which is a vendor_available:true library
cannot depend on libunwind which is not available to vendors. Instead of
including libunwind inside libunwindbacktrace, libunwind is explicitly
added to the dependency list along with libunwindbacktrace when
libunwindbacktrace is required by other modules. (see libcompiler_rt)

Bug: 64730695
Test: build 2017 pixel device
Change-Id: I3fd2eb25efa26dc5fc55d7e64c8f4e9ab13156ea

1 files changed, 2 insertions, 3 deletions

diff --git a/Android.bp b/Android.bp
index bbebc33f..cb527c59 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,7 +22,6 @@
 cc_defaults {
     name: "libunwind_defaults",
     host_supported: true,
-    vendor_available: true,
 
     cppflags: [
         "-Wno-old-style-cast",
@@ -124,6 +123,7 @@ cc_defaults {
 cc_library {
     name: "libunwind",
     defaults: ["libunwind_defaults"],
+    vendor_available: false,
     vndk: {
         enabled: true,
         support_system_process: true,
@@ -427,6 +427,7 @@ cc_library {
 cc_library_static {
     name: "libunwindbacktrace",
     defaults: ["libunwind_defaults"],
+    vendor_available: true,
     sdk_version: "21",
     srcs: [
         "src/unwind/BacktraceWrapper.c",
@@ -454,8 +455,6 @@ cc_library_static {
         "-fvisibility=hidden",
     ],
 
-    whole_static_libs: ["libunwind"],
-
     target: {
         linux_bionic: {
             enabled: true,