From d3e10bb694890c368e67edf65aa1692c0e5685fd Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Fri, 27 Jul 2012 09:39:21 +0900 Subject: [PATCH] Build LatinIME with NDK r8 Change-Id: I0e233f9561f4bb4dee2311b98e7b0a1cd9cd5061 --- native/jni/Android.mk | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 06ed5718e..e9ca91a59 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -69,14 +69,9 @@ 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 -LOCAL_NDK_VERSION := 7 +LOCAL_NDK_VERSION := 8 LOCAL_SDK_VERSION := 14 LOCAL_NDK_STL_VARIANT := stlport_static -endif include $(BUILD_STATIC_LIBRARY) ###################################### @@ -98,14 +93,9 @@ 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 -LOCAL_NDK_VERSION := 7 +LOCAL_NDK_VERSION := 8 LOCAL_SDK_VERSION := 14 LOCAL_NDK_STL_VARIANT := stlport_static -endif include $(BUILD_SHARED_LIBRARY)