Add explicit dependencies on jni_headers

Bug: 152482542
Test: lunch aosp_x86_64 && m checkbuild
Change-Id: I1859a5b15d7e1a4939968908d862d27b2345acc4

2 files changed, 16 insertions, 4 deletions

diff --git a/libnativebridge/Android.bp b/libnativebridge/Android.bp
index b5dc32495b..ae04612983 100644
--- a/libnativebridge/Android.bp
+++ b/libnativebridge/Android.bp
@@ -4,8 +4,14 @@ cc_defaults {
     cppflags: [
         "-fvisibility=protected",
     ],
-    header_libs: ["libnativebridge-headers"],
-    export_header_lib_headers: ["libnativebridge-headers"],
+    header_libs: [
+        "jni_headers",
+        "libnativebridge-headers",
+    ],
+    export_header_lib_headers: [
+        "jni_headers",
+        "libnativebridge-headers",
+    ],
 }
 
 cc_library_headers {
diff --git a/libnativebridge/tests/Android.bp b/libnativebridge/tests/Android.bp
index 4ccf35e7d8..50bf0abd25 100644
--- a/libnativebridge/tests/Android.bp
+++ b/libnativebridge/tests/Android.bp
@@ -32,7 +32,10 @@ cc_defaults {
             ],
         },
     },
-    header_libs: ["libnativebridge-headers"],
+    header_libs: [
+        "jni_headers",
+        "libnativebridge-headers",
+    ],
     cppflags: ["-fvisibility=protected"],
 }
 
@@ -159,5 +162,8 @@ cc_test {
     srcs: [
         "NativeBridgeApi.c",
     ],
-    header_libs: ["libnativebridge-headers"],
+    header_libs: [
+        "jni_headers",
+        "libnativebridge-headers",
+    ],
 }