commit bd1ed5b8599412a44b7193091ee17b9435147031
author Robert CH Chou <Robert_CH_Chou@acer.com.tw> Fri Dec 17 20:57:52 2010 +0800
committer Robert_CH_Chou <Robert_CH_Chou@acer.com.tw> Thu Jan 19 10:02:25 2012 +0800
tree 69c2659811e54a2da7ab17b2148fa12546bb4cb9
parent 23c45bac209c18dd8fd6260e338e566df946c968

Make the JNI lib an optional module

Make it a user module will force it installed no matter the
IME is actually required by the product or not. Replace the
user by optional and add requiring the libjni_latinime by using
LOCAL_REQUIRED_MODULES

Change-Id: Ibfc37cf2e2391021d45538c7cea342894b56fbf8

java/Android.mk

diff --git a/java/Android.mk b/java/Android.mk
index 43168e5..e9fa52e 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -10,6 +10,7 @@
 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

native/Android.mk

diff --git a/native/Android.mk b/native/Android.mk
index f07be6a..cf1da4a 100644
--- a/native/Android.mk
+++ b/native/Android.mk
@@ -43,7 +43,7 @@
 
 LOCAL_MODULE := libjni_latinime
 
-LOCAL_MODULE_TAGS := user
+LOCAL_MODULE_TAGS := optional
 
 ifeq ($(FLAG_DO_PROFILE), true)
     $(warning Making profiling version of native library)