From ea92b7b987abbaadf5aa2cccf96e8fab4f3ab612 Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Tue, 10 Jul 2012 09:19:07 +0900
Subject: [PATCH] Avoid LatinIME crash

bug: 6790620

Change-Id: I6fd271c6f79790cfb9d875b052854eab60a30b7f
---
 native/jni/Android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 613540993f..54f61d90d1 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
-- 
GitLab