commit 69b04cd3eb4946d9c668f8dcb4f7df10dad730fe
author Jaesoo Lee <jaesoo@google.com> Fri Apr 28 00:55:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 28 00:55:51 2017 +0000
tree 7a618e334d590032615512e0a7ffb0c2bfe50a90
parent 491654f15fbc778e37e8c5aae4931ffb0f3881ce
parent 6a604f01539587c01c8deed8e7b0bfe866bae424

Merge changes from topic 'libutils-export-headers'
am: 4af3a7966b

Change-Id: I390c56cfc6312ded05ee359931faabf9517c4067

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 4d076d5..846a585 100644
--- a/libsystem/Android.bp
+++ b/libsystem/Android.bp
@@ -1,4 +1,15 @@
 cc_library_headers {
     name: "libsystem_headers",
+    vendor_available: true,
+    host_supported: true,
     export_include_dirs: ["include"],
+
+    target: {
+        linux_bionic: {
+            enabled: true,
+        },
+        windows: {
+            enabled: true,
+        },
+    }
 }

libutils/Android.bp

diff --git a/libutils/Android.bp b/libutils/Android.bp
index b46ad62..33770ba 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -16,8 +16,22 @@
     name: "libutils_headers",
     vendor_available: true,
     host_supported: true,
+
+    header_libs: [
+        "libsystem_headers",
+        "libcutils_headers"
+    ],
+    export_header_lib_headers: [
+        "libsystem_headers",
+        "libcutils_headers"
+    ],
     export_include_dirs: ["include"],
+
     target: {
+        android: {
+            header_libs: ["libbacktrace_headers"],
+            export_header_lib_headers: ["libbacktrace_headers"],
+        },
         linux_bionic: {
             enabled: true,
         },