From bd1ed5b8599412a44b7193091ee17b9435147031 Mon Sep 17 00:00:00 2001 From: Robert CH Chou Date: Fri, 17 Dec 2010 20:57:52 +0800 Subject: [PATCH] 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 | 1 + native/Android.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/java/Android.mk b/java/Android.mk index 43168e563..e9fa52ef3 100644 --- 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 diff --git a/native/Android.mk b/native/Android.mk index f07be6abe..cf1da4a41 100644 --- 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)