Merge "Add jni_headers to export only jni.h to vendor and platform." am: 1e942ba689 am: 09b2f6273c
am: 8d9a6e1f58

Change-Id: I61aa873e064afd0aa5f57f948098aed1d502cc56
diff --git a/Android.bp b/Android.bp
index fe073d8..30a9c59 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+cc_library_headers {
+    name: "jni_headers",
+    host_supported: true,
+    export_include_dirs: ["include_jni"],
+    vendor_available: true,
+}
+
 cc_library {
     name: "libnativehelper",
     host_supported: true,
@@ -31,7 +38,10 @@
             srcs: ["AsynchronousCloseMonitor.cpp"],
             host_ldlibs: ["-ldl"],
         },
-   },
+    },
+
+    header_libs: ["jni_headers"],
+    export_header_lib_headers: ["jni_headers"],
 
     shared_libs: [
         "liblog",
@@ -41,6 +51,7 @@
         "-Werror",
         "-fvisibility=protected",
     ],
+
     export_include_dirs: ["include", "platform_include"],
 }
 
diff --git a/include_jni/jni.h b/include_jni/jni.h
new file mode 120000
index 0000000..88d1a00
--- /dev/null
+++ b/include_jni/jni.h
@@ -0,0 +1 @@
+../include/nativehelper/jni.h
\ No newline at end of file