diff options
| author |   Jean-Baptiste Queru <jbq@google.com> | 2012-01-23 09:06:00 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-01-23 09:06:00 -0800 |
| commit | 11c41216f137ad08e8f42daff7a5030f41be0c55 (patch) | |
| tree | 7f0a669b25d1e7f4548de30b56a5e94ea49eeb44 | |
| parent | f8dbeb00df29f59cea622ba28fdf8e3eba521a28 (diff) | |
| parent | 2577fca158ee8cd7162c3550b465cab73b0a7dbc (diff) | |
| download | latinime-11c41216f137ad08e8f42daff7a5030f41be0c55.tar.gz latinime-11c41216f137ad08e8f42daff7a5030f41be0c55.tar.xz latinime-11c41216f137ad08e8f42daff7a5030f41be0c55.zip | |
Merge 2577fca1
Change-Id: Ie2c9f6c2eafb59dff95db8954481ce49c87a6d44
| -rw-r--r-- | java/Android.mk | 1 | ||||
| -rw-r--r-- | native/jni/Android.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/java/Android.mk b/java/Android.mk index 36ff506bf..0aac3f05d 100644 --- a/java/Android.mk +++ b/java/Android.mk @@ -24,6 +24,7 @@ LOCAL_PACKAGE_NAME := LatinIME LOCAL_CERTIFICATE := shared LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime +LOCAL_REQUIRED_MODULES := libjni_latinime LOCAL_STATIC_JAVA_LIBRARIES := android-common LOCAL_STATIC_JAVA_LIBRARIES += inputmethod-common diff --git a/native/jni/Android.mk b/native/jni/Android.mk index c4adbfab4..53bd21ddc 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -66,7 +66,7 @@ endif LOCAL_MODULE := libjni_latinime -LOCAL_MODULE_TAGS := user +LOCAL_MODULE_TAGS := optional # For STL LOCAL_C_INCLUDES += external/stlport/stlport bionic |