Merge changes Ia4eb5378,I745031b8 into oc-dev

* changes:
  Mark as vendor_available
  Export headers as libhardware_headers

1 files changed, 8 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 1a28421d..739cb6d6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,11 @@
 // Copyright 2006 The Android Open Source Project
 
+cc_library_headers {
+    name: "libhardware_headers",
+    export_include_dirs: ["include"],
+    vendor_available: true,
+}
+
 cc_library_shared {
     name: "libhardware",
 
@@ -11,6 +17,8 @@ cc_library_shared {
     ],
     header_libs: ["libsystem_headers"],
     cflags: ["-DQEMU_HARDWARE"],
+    export_include_dirs: ["include"],
+    vendor_available: true,
 }
 
 subdirs = [