Merge 2577fca1

Change-Id: Ie2c9f6c2eafb59dff95db8954481ce49c87a6d44
2012-01-23 09:06:00 -08:00 · 2012-01-23 09:06:00 -08:00 · 11c41216f1
parent f8dbeb00df 2577fca158
commit 11c41216f1
2 changed files with 2 additions and 1 deletions
--- 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
--- 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