Avoid LatinIME crash
bug: 6790620
Change-Id: I6fd271c6f79790cfb9d875b052854eab60a30b7f
diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 6135409..54f61d9 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -68,6 +68,7 @@
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 @@
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