commit 11c41216f137ad08e8f42daff7a5030f41be0c55
author Jean-Baptiste Queru <jbq@google.com> Mon Jan 23 09:06:00 2012 -0800
committer Jean-Baptiste Queru <jbq@google.com> Mon Jan 23 09:06:00 2012 -0800
tree 7f0a669b25d1e7f4548de30b56a5e94ea49eeb44
parent f8dbeb00df29f59cea622ba28fdf8e3eba521a28
parent 2577fca158ee8cd7162c3550b465cab73b0a7dbc

Merge 2577fca1

Change-Id: Ie2c9f6c2eafb59dff95db8954481ce49c87a6d44

java/Android.mk

diff --git a/java/Android.mk b/java/Android.mk
index 36ff506..0aac3f0 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -24,6 +24,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/jni/Android.mk

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index c4adbfa..53bd21d 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -66,7 +66,7 @@
 
 LOCAL_MODULE := libjni_latinime
 
-LOCAL_MODULE_TAGS := user
+LOCAL_MODULE_TAGS := optional
 
 # For STL
 LOCAL_C_INCLUDES += external/stlport/stlport bionic