Merge "Add explicit dependencies on jni_headers" am: c0fe0ae29f am: 6963d8e1c8

Change-Id: I2fdf3826653466d65e3d63fa896d1ec23c5716cd

cmds/bootanimation/Android.bp

@@ -28,6 +28,8 @@ cc_binary {
     name: "bootanimation",
     defaults: ["bootanimation_defaults"],
 
+    header_libs: ["jni_headers"],
+
     shared_libs: [
         "libOpenSLES",
         "libbootanimation",

core/tests/utiltests/jni/Android.bp

@@ -14,6 +14,7 @@
 
 cc_library_shared {
     name: "libmemoryintarraytest",
+    header_libs: ["jni_headers"],
     shared_libs: [
         "libcutils",
     ],
@@ -23,4 +24,4 @@ cc_library_shared {
         "android_util_MemoryIntArrayTest.cpp",
     ],
     cflags: ["-Werror"],
-}
+}

libs/hwui/PathParser.cpp

@@ -16,8 +16,6 @@
 
 #include "PathParser.h"
 
-#include "jni.h"
-
 #include <errno.h>
 #include <stdlib.h>
 #include <utils/Log.h>

libs/hwui/PathParser.h

@@ -22,7 +22,6 @@
 
 #include <android/log.h>
 #include <cutils/compiler.h>
-#include <jni.h>
 
 #include <string>
 

media/mca/filterfw/Android.bp

@@ -65,6 +65,8 @@ cc_library_static {
         "-Wno-unused-parameter",
     ],
 
+    header_libs: ["jni_headers"],
+
     shared_libs: [
         "libmedia",
         "libgui",

native/webview/loader/Android.bp

@@ -24,6 +24,8 @@ cc_library_shared {
 
     cflags: ["-Werror"],
 
+    header_libs: ["jni_headers"],
+
     shared_libs: [
         "libdl",
         "liblog",

tools/aapt2/Android.bp

@@ -47,6 +47,7 @@ cc_defaults {
             cflags: ["-D_DARWIN_UNLIMITED_STREAMS"],
         },
     },
+    header_libs: ["jni_headers"],
     static_libs: [
         "libandroidfw",
         "libutils",

tools/dump-coverage/Android.bp

@@ -19,6 +19,7 @@ cc_library {
     name: "libdumpcoverage",
     srcs: ["dump_coverage.cc"],
     header_libs: [
+        "jni_headers",
         "libopenjdkjvmti_headers",
     ],