From 3cfbb81ba01f69d879b19a4a52d1e15014f109d9 Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Thu, 26 Jul 2012 13:35:42 -0700 Subject: [PATCH] Build LatinIME with NDK r8 To remove incorrect __exidx_start and __exidx_end references newer platform libc.so no longer exports. Related CL & issue: http://b/issue?id=6794540 https://googleplex-android-review.googlesource.com/#/c/209741 https://googleplex-android-review.googlesource.com/#/c/211459 Change-Id: I30f49a1277c1f89dcc15973db8851c0002db4b66 --- 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)