nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 11c41216: Merge 2577fca1 

* commit '11c41216f137ad08e8f42daff7a5030f41be0c55':
  Make the JNI lib an optional module
main
Jean-Baptiste Queru 2012-01-23 09:18:30 -08:00 committed by Android Git Automerger
parent cf1c08a9de 11c41216f1
commit e152e65605
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/Android.mk
View File

@ -24,6 +24,7 @@ LOCAL_PACKAGE_NAME := LatinIME
LOCAL_CERTIFICATE := shared LOCAL_CERTIFICATE := shared
LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
LOCAL_REQUIRED_MODULES := libjni_latinime
LOCAL_STATIC_JAVA_LIBRARIES := android-common LOCAL_STATIC_JAVA_LIBRARIES := android-common
LOCAL_STATIC_JAVA_LIBRARIES += inputmethod-common LOCAL_STATIC_JAVA_LIBRARIES += inputmethod-common

2
native/jni/Android.mk
View File

@ -66,7 +66,7 @@ endif
LOCAL_MODULE := libjni_latinime LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := user LOCAL_MODULE_TAGS := optional
# For STL # For STL
LOCAL_C_INCLUDES += external/stlport/stlport bionic LOCAL_C_INCLUDES += external/stlport/stlport bionic