Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea

Change-Id: Ibc27e9196b7bc9328e465a90c685b9c05460718e
2020-04-15 17:04:32 +00:00 · 2020-04-15 17:04:32 +00:00 · aab67ba15e
parent 2474a95a37 d3af5a28ea
commit aab67ba15e
2 changed files with 3 additions and 0 deletions
--- a/native/dicttoolkit/Android.bp
+++ b/native/dicttoolkit/Android.bp
@ -37,6 +37,7 @@ cc_defaults {
        "-Wno-unused-function",
    ],

+    header_libs: ["jni_headers"],
    local_include_dirs: ["src"],
    // TODO
    include_dirs: ["packages/inputmethods/LatinIME/native/jni/src"],
--- a/native/jni/Android.bp
+++ b/native/jni/Android.bp
@ -130,6 +130,7 @@ cc_library {
        "-Wno-unused-parameter",
        "-Wno-unused-function",
    ],
+    header_libs: ["jni_headers"],
    local_include_dirs: ["src"],

    srcs: [
@ -167,6 +168,7 @@ cc_library_static {
        "-Wall",
        "-Werror",
    ],
+    header_libs: ["jni_headers"],
    local_include_dirs: ["src"],
    sdk_version: "14",
    stl: "libc++_static",