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

Change-Id: I33cbd8a4d6188eed69cb8b55acb3b78b0628d82a

1 files changed, 7 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 739cb6d6..f3426e85 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 @@ cc_library_shared {
         "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,
 }