commit e04cfb092e0d4e7d0da1ca177a0d70102b70d6bc
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 15 17:28:09 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 15 17:28:09 2020 +0000
tree 734776a3a7dc7789a945ca5130f2f7a224d71bf3
parent f5345e8d04b8e4d5cafd6390fbf466cb98108fc7
parent aab67ba15eafc4cf8df6f6ece8c52451016eede6

Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea am: aab67ba15e

Change-Id: I6d376cc2492ed2969c85a72f4456d3711db2f72a

native/dicttoolkit/Android.bp

diff --git a/native/dicttoolkit/Android.bp b/native/dicttoolkit/Android.bp
index b214ff9..fd35697 100644
--- a/native/dicttoolkit/Android.bp
+++ b/native/dicttoolkit/Android.bp
@@ -37,6 +37,7 @@
         "-Wno-unused-function",
     ],
 
+    header_libs: ["jni_headers"],
     local_include_dirs: ["src"],
     // TODO
     include_dirs: ["packages/inputmethods/LatinIME/native/jni/src"],

native/jni/Android.bp

diff --git a/native/jni/Android.bp b/native/jni/Android.bp
index 5649fc1..7419ed1 100644
--- a/native/jni/Android.bp
+++ b/native/jni/Android.bp
@@ -130,6 +130,7 @@
         "-Wno-unused-parameter",
         "-Wno-unused-function",
     ],
+    header_libs: ["jni_headers"],
     local_include_dirs: ["src"],
 
     srcs: [
@@ -167,6 +168,7 @@
         "-Wall",
         "-Werror",
     ],
+    header_libs: ["jni_headers"],
     local_include_dirs: ["src"],
     sdk_version: "14",
     stl: "libc++_static",