commit 305e08d4745f77cb4dba8538c7b26fd409994487
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 14 17:59:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 14 17:59:29 2017 +0000
tree 336649eca9518ffb18a99a0aa498244c693dc278
parent 291255a9d81aa92d72db9ed808b9fbb472f8d1f2
parent eb7a9ddce09441f03f52c78f2b77a937ab5d7bcb

Merge "libbacktrace: make vendor_available" into oc-dev

base/Android.bp

diff --git a/base/Android.bp b/base/Android.bp
index 7b1dc8e..ae64f4d 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -20,8 +20,28 @@
     "-Werror",
 ]
 
+cc_library_headers {
+    name: "libbase_headers",
+    vendor_available: true,
+    host_supported: true,
+    export_include_dirs: ["include"],
+
+    header_libs: ["libutils_headers"],
+    export_header_lib_headers: ["libutils_headers"],
+
+    target: {
+        linux_bionic: {
+            enabled: true,
+        },
+        windows: {
+            enabled: true,
+        },
+    },
+}
+
 cc_library {
     name: "libbase",
+    vendor_available: true,
     clang: true,
     host_supported: true,
     srcs: [
@@ -33,10 +53,13 @@
         "strings.cpp",
         "test_utils.cpp",
     ],
-    local_include_dirs: ["include"],
+
+    header_libs: ["libbase_headers"],
+    export_header_lib_headers: ["libbase_headers"],
+
     cppflags: libbase_cppflags,
-    export_include_dirs: ["include"],
     shared_libs: ["liblog"],
+    header_libs: ["libutils_headers"],
     target: {
         android: {
             srcs: [

libbacktrace/Android.bp

diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 4a525be..285aa6e 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -57,6 +57,7 @@
 
 cc_library_headers {
     name: "libbacktrace_headers",
+    vendor_available: true,
     export_include_dirs: ["include"],
 }
 

libsystem/Android.bp

diff --git a/libsystem/Android.bp b/libsystem/Android.bp
index 846a585..e92fe63 100644
--- a/libsystem/Android.bp
+++ b/libsystem/Android.bp
@@ -2,6 +2,10 @@
     name: "libsystem_headers",
     vendor_available: true,
     host_supported: true,
+
+    header_libs: ["libaudio_system_headers"],
+    export_header_lib_headers: ["libaudio_system_headers"],
+
     export_include_dirs: ["include"],
 
     target: {

libutils/Android.bp

diff --git a/libutils/Android.bp b/libutils/Android.bp
index 88c9efd..696db3b 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -16,8 +16,16 @@
     name: "libutils_headers",
     vendor_available: true,
     host_supported: true,
+
+    header_libs: ["libsystem_headers",],
+    export_header_lib_headers: ["libsystem_headers",],
     export_include_dirs: ["include"],
+
     target: {
+        android: {
+            header_libs: ["libbacktrace_headers"],
+            export_header_lib_headers: ["libbacktrace_headers"],
+        },
         linux_bionic: {
             enabled: true,
         },
@@ -59,11 +67,9 @@
     cflags: ["-Werror"],
     include_dirs: ["external/safe-iop/include"],
     header_libs: [
-        "libsystem_headers",
         "libutils_headers",
     ],
     export_header_lib_headers: [
-        "libsystem_headers",
         "libutils_headers",
     ],