diff options
| author |   Treehugger Robot <treehugger-gerrit@google.com> | 2020-04-15 18:31:42 +0000 |
|---|---|---|
| committer |   Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-15 18:31:42 +0000 |
| commit | 10b9098292291ee809dce5fa78b6d0672ce5bf90 (patch) | |
| tree | 734776a3a7dc7789a945ca5130f2f7a224d71bf3 | |
| parent | f14a322dabed90fcdac6d776394e016c69e9a837 (diff) | |
| parent | 3b8eaf98ca985522af5fa4f8f8726e9ad97176ef (diff) | |
| download | latinime-10b9098292291ee809dce5fa78b6d0672ce5bf90.tar.gz latinime-10b9098292291ee809dce5fa78b6d0672ce5bf90.tar.xz latinime-10b9098292291ee809dce5fa78b6d0672ce5bf90.zip | |
Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea am: aab67ba15e am: e04cfb092e am: 3b8eaf98ca
Change-Id: I4c9319ccd0699e04d088d4e27430a2326b70bcfb
| -rw-r--r-- | native/dicttoolkit/Android.bp | 1 | ||||
| -rw-r--r-- | native/jni/Android.bp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/native/dicttoolkit/Android.bp b/native/dicttoolkit/Android.bp index b214ff984..fd35697c1 100644 --- 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"], diff --git a/native/jni/Android.bp b/native/jni/Android.bp index 5649fc1ea..7419ed1fe 100644 --- 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", |