diff options
| author | Orion Hodson <oth@google.com> | 2020-04-16 10:29:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-04-16 10:29:06 +0000 |
| commit | c0fe0ae29f7de3cfeaad22563cf1e501235b4693 (patch) | |
| tree | cacd1c50dd0984a0428caea8e8634c29fb39dbf9 | |
| parent | 0ca532a78c9700da7e2c890767395035987cda32 (diff) | |
| parent | 63f06b738dde1f495a4feb47b2188636cb6b3044 (diff) | |
Merge "Add explicit dependencies on jni_headers"
| -rw-r--r-- | cmds/bootanimation/Android.bp | 2 | ||||
| -rw-r--r-- | core/tests/utiltests/jni/Android.bp | 3 | ||||
| -rw-r--r-- | libs/hwui/PathParser.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/PathParser.h | 1 | ||||
| -rw-r--r-- | media/mca/filterfw/Android.bp | 2 | ||||
| -rw-r--r-- | native/webview/loader/Android.bp | 2 | ||||
| -rw-r--r-- | tools/aapt2/Android.bp | 1 | ||||
| -rw-r--r-- | tools/dump-coverage/Android.bp | 1 |
8 files changed, 10 insertions, 4 deletions
diff --git a/cmds/bootanimation/Android.bp b/cmds/bootanimation/Android.bp index 3e5877b05708..c60d08b2bda1 100644 --- a/cmds/bootanimation/Android.bp +++ b/cmds/bootanimation/Android.bp @@ -28,6 +28,8 @@ cc_binary { name: "bootanimation", defaults: ["bootanimation_defaults"], + header_libs: ["jni_headers"], + shared_libs: [ "libOpenSLES", "libbootanimation", diff --git a/core/tests/utiltests/jni/Android.bp b/core/tests/utiltests/jni/Android.bp index b0b09c27e325..6b75471a358a 100644 --- a/core/tests/utiltests/jni/Android.bp +++ b/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"],
-}
\ No newline at end of file +}
diff --git a/libs/hwui/PathParser.cpp b/libs/hwui/PathParser.cpp index 808921d344da..61d06c2697aa 100644 --- a/libs/hwui/PathParser.cpp +++ b/libs/hwui/PathParser.cpp @@ -16,8 +16,6 @@ #include "PathParser.h" -#include "jni.h" - #include <errno.h> #include <stdlib.h> #include <utils/Log.h> diff --git a/libs/hwui/PathParser.h b/libs/hwui/PathParser.h index f5bebce605fb..878bb7c0f137 100644 --- a/libs/hwui/PathParser.h +++ b/libs/hwui/PathParser.h @@ -22,7 +22,6 @@ #include <android/log.h> #include <cutils/compiler.h> -#include <jni.h> #include <string> diff --git a/media/mca/filterfw/Android.bp b/media/mca/filterfw/Android.bp index 71899cf1653f..0e0ecf331afc 100644 --- a/media/mca/filterfw/Android.bp +++ b/media/mca/filterfw/Android.bp @@ -65,6 +65,8 @@ cc_library_static { "-Wno-unused-parameter", ], + header_libs: ["jni_headers"], + shared_libs: [ "libmedia", "libgui", diff --git a/native/webview/loader/Android.bp b/native/webview/loader/Android.bp index 0ba256facb6d..dfa5bdde0785 100644 --- a/native/webview/loader/Android.bp +++ b/native/webview/loader/Android.bp @@ -24,6 +24,8 @@ cc_library_shared { cflags: ["-Werror"], + header_libs: ["jni_headers"], + shared_libs: [ "libdl", "liblog", diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp index 53372bff3e67..a2709bd545b2 100644 --- a/tools/aapt2/Android.bp +++ b/tools/aapt2/Android.bp @@ -47,6 +47,7 @@ cc_defaults { cflags: ["-D_DARWIN_UNLIMITED_STREAMS"], }, }, + header_libs: ["jni_headers"], static_libs: [ "libandroidfw", "libutils", diff --git a/tools/dump-coverage/Android.bp b/tools/dump-coverage/Android.bp index 4519ce3636bf..94356ebac035 100644 --- a/tools/dump-coverage/Android.bp +++ b/tools/dump-coverage/Android.bp @@ -19,6 +19,7 @@ cc_library { name: "libdumpcoverage", srcs: ["dump_coverage.cc"], header_libs: [ + "jni_headers", "libopenjdkjvmti_headers", ], |