diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index 24cad4d..ce91249 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -70,6 +70,7 @@
     ],
 
     header_libs: [
+        "jni_headers",
         "libmediadrm_headers",
     ],
 
@@ -97,6 +98,8 @@
         "libmediandk_utils",
     ],
 
+    export_header_lib_headers: ["jni_headers"],
+
     export_include_dirs: ["include"],
 
     export_shared_lib_headers: [