am 9a84071b: Merge "Make the JNI lib an optional module"

* commit '9a84071b36b71c9cf2b454b45308f6c1e22c0c26': Make the JNI lib an optional module
2012-01-20 12:02:31 -08:00 · 2012-01-20 12:02:31 -08:00 · 2577fca158
parent 201a8ba853 9a84071b36
commit 2577fca158
2 changed files with 2 additions and 1 deletions
--- a/java/Android.mk
+++ b/java/Android.mk
@ -10,6 +10,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/Android.mk
+++ b/native/Android.mk
@ -43,7 +43,7 @@ endif

 LOCAL_MODULE := libjni_latinime

-LOCAL_MODULE_TAGS := user
+LOCAL_MODULE_TAGS := optional

 ifeq ($(FLAG_DO_PROFILE), true)
    $(warning Making profiling version of native library)