commit 003f740dc39a75f522eefe33d8a98488a2108ca7
author Steven Moreland <smoreland@google.com> Thu Apr 13 19:14:57 2017 -0700
committer Steven Moreland <smoreland@google.com> Wed Apr 19 10:36:50 2017 -0700
tree 714bd8d1e97b5a62f3c59a69da17de6869367bd8
parent 24576e1221c6205383037af439413729665d2157

libhardware: export system headers

libhardware uses system headers in its headers.

Test: links
Test: libraries using libhardware which don't have access to system
headers link when BOARD_VNDK_VERSION := current.
Bug: 33241851
(cherry picked from commit d39335254a55089a37ac63c2764dfe7efd292ec4)
Merged-In: I33cbd8a4d6188eed69cb8b55acb3b78b0628d82a
Change-Id: I33cbd8a4d6188eed69cb8b55acb3b78b0628d82a

Android.bp

diff --git a/Android.bp b/Android.bp
index 739cb6d..f3426e8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,6 +2,9 @@
 
 cc_library_headers {
     name: "libhardware_headers",
+    header_libs: ["libsystem_headers"],
+    export_header_lib_headers: ["libsystem_headers"],
+
     export_include_dirs: ["include"],
     vendor_available: true,
 }
@@ -15,9 +18,11 @@
         "liblog",
         "libdl",
     ],
-    header_libs: ["libsystem_headers"],
     cflags: ["-DQEMU_HARDWARE"],
-    export_include_dirs: ["include"],
+
+    header_libs: ["libhardware_headers"],
+    export_header_lib_headers: ["libhardware_headers"],
+
     vendor_available: true,
 }