commit 39a290b0e0549894efddcbfb7c382a76cce48804
author Steven Moreland <smoreland@google.com> Wed Apr 12 18:57:57 2017 -0700
committer Jaesoo Lee <jaesoo@google.com> Fri Apr 28 09:42:50 2017 +0900
tree 9738eeff69b4f510c6891eb06586f86d6ebc3e5d
parent 323e2dffb2e122465f363c5fc7f36e833cb3f113

libutils: export system_headers

vendor + vendor_available modules built with BOARD_VNDK_VERSION :=
current aren't allowed to use global headers. Since libutils uses
system headers itself, it should export them as well.

Bug: 33241851
Test: building with BOARD_VNDK_VERSION := current produces many fewer
errors.

Change-Id: Icc7d2beb2a17da291434c6282eb1b9eb458f114c
Merged-In: I950821f1dae3ddc110db50869247913d5b1aa638

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..83b2682 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -16,6 +16,9 @@
     name: "libutils_headers",
     vendor_available: true,
     host_supported: true,
+
+    header_libs: ["libsystem_headers",],
+    export_header_lib_headers: ["libsystem_headers",],
     export_include_dirs: ["include"],
     target: {
         linux_bionic: {