commit afc0aa78f4a513ab3fddd01a3fb6a03a401801cb
author Jaesoo Lee <jaesoo@google.com> Fri Apr 28 00:57:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 28 00:57:13 2017 +0000
tree f9a3e0a9bd43f147b198d2b6a9d3a90ddd49bde0
parent d13dca13e82d69ae72087540ff0f71eb9d5465e5
parent 0951ddeb696d7c35e00d13e02a2a2d870efceab8

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

Change-Id: I6e82e0ef68e1acdc617efe436873218f22a51412

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,
         },