diff options
| author |   Andrew Hsieh <andrewhsieh@google.com> | 2012-07-26 13:35:42 -0700 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2012-07-26 13:35:42 -0700 |
| commit | 3cfbb81ba01f69d879b19a4a52d1e15014f109d9 (patch) | |
| tree | 27aa162e1172f1cd362bcb3a609e9b19be7a2ce2 | |
| parent | 7677a0ee7f6555a8dc58813c9bf5eb7aca8b18ef (diff) | |
| download | latinime-3cfbb81ba01f69d879b19a4a52d1e15014f109d9.tar.gz latinime-3cfbb81ba01f69d879b19a4a52d1e15014f109d9.tar.xz latinime-3cfbb81ba01f69d879b19a4a52d1e15014f109d9.zip | |
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
| -rw-r--r-- | native/jni/Android.mk | 14 |
1 files 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) |