aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2012-07-10 09:19:07 +0900
committerKen Wakasa <kwakasa@google.com>2012-07-10 09:57:04 +0900
commitea92b7b987abbaadf5aa2cccf96e8fab4f3ab612 (patch)
treeafa05a465915043608092baf3295946ba9b158a6
parent0493bb2f101540265ccd49754ed1ecc5dcb7b667 (diff)
downloadlatinime-ea92b7b987abbaadf5aa2cccf96e8fab4f3ab612.tar.gz
latinime-ea92b7b987abbaadf5aa2cccf96e8fab4f3ab612.tar.xz
latinime-ea92b7b987abbaadf5aa2cccf96e8fab4f3ab612.zip
Avoid LatinIME crash
bug: 6790620 Change-Id: I6fd271c6f79790cfb9d875b052854eab60a30b7f
-rw-r--r--native/jni/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 613540993..54f61d90d 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -68,6 +68,7 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime_common_static
LOCAL_MODULE_TAGS := optional
+# TODO: Remove this conditional block once we have no issues with building against NDK
ifndef TARGET_BUILD_APPS # A full system image build
include external/stlport/libstlport.mk
else # An unbundled build
@@ -96,6 +97,7 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := optional
+# TODO: Remove this conditional block once we have no issues with building against NDK
ifndef TARGET_BUILD_APPS # A full system image build
LOCAL_STATIC_LIBRARIES += libstlport_static
else # An unbundled build