diff options
| author |   Jean-Baptiste Queru <jbq@google.com> | 2012-01-23 09:18:30 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-01-23 09:18:30 -0800 |
| commit | e152e65605d0769a24a1cc64c6dc06236a38cea8 (patch) | |
| tree | 7f0a669b25d1e7f4548de30b56a5e94ea49eeb44 | |
| parent | cf1c08a9de166c5bdb6ad10c4f5a08b57dc28e87 (diff) | |
| parent | 11c41216f137ad08e8f42daff7a5030f41be0c55 (diff) | |
| download | latinime-e152e65605d0769a24a1cc64c6dc06236a38cea8.tar.gz latinime-e152e65605d0769a24a1cc64c6dc06236a38cea8.tar.xz latinime-e152e65605d0769a24a1cc64c6dc06236a38cea8.zip | |
am 11c41216: Merge 2577fca1
* commit '11c41216f137ad08e8f42daff7a5030f41be0c55':
Make the JNI lib an optional module
| -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 |