diff options
| author |   Treehugger Robot <treehugger-gerrit@google.com> | 2020-04-15 17:04:32 +0000 |
|---|---|---|
| committer |   Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-15 17:04:32 +0000 |
| commit | aab67ba15eafc4cf8df6f6ece8c52451016eede6 (patch) | |
| tree | f822b2f287a7acb32b28068752b64448fbf0b459 | |
| parent | 2474a95a37edec09b250bfeb3266966c1bda7851 (diff) | |
| parent | d3af5a28ea68305c950699f98401e9a4e1678813 (diff) | |
| download | latinime-aab67ba15eafc4cf8df6f6ece8c52451016eede6.tar.gz latinime-aab67ba15eafc4cf8df6f6ece8c52451016eede6.tar.xz latinime-aab67ba15eafc4cf8df6f6ece8c52451016eede6.zip | |
Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea
Change-Id: Ibc27e9196b7bc9328e465a90c685b9c05460718e
| -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", |