commit 4a6da2c7ffcef82541fb8e909e7817bbcb1e8be6
author Tadashi G. Takaoka <takaoka@google.com> Thu Mar 29 17:14:21 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 29 17:14:21 2012 -0700
tree 1386cdf70067c48e29286581b693d98dc58dfdb4
parent caaac8fc842adb06759379438615f454d05f9553
parent 710c69fc82c172f802d2e06276b61e7e077ae094

am 710c69fc: Dynamically determine key preview backing view height

* commit '710c69fc82c172f802d2e06276b61e7e077ae094':
  Dynamically determine key preview backing view height

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..24c0037 100644
--- a/native/Android.mk
+++ b/native/Android.mk
@@ -28,6 +28,10 @@
     TARGETING_UNBUNDLED_FROYO := false
 endif
 
+ifeq ($(TARGET_ARCH),mips)
+    TARGETING_UNBUNDLED_FROYO := false
+endif
+
 ifeq ($(FLAG_DBG), true)
     TARGETING_UNBUNDLED_FROYO := false
 endif
@@ -43,7 +47,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)