diff options
| author |   Andrew Hsieh <andrewhsieh@google.com> | 2012-07-26 21:28:07 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-07-26 21:28:08 -0700 |
| commit | fb961d1e15a6a0d917a4cfe0e69c8f5cd2dce0b8 (patch) | |
| tree | e3866b9a1acc8a8d0f991d14db1450e458045928 | |
| parent | 69d8ad2f9771eb007fd23a8fe140ac7c6d508eb1 (diff) | |
| parent | 3cfbb81ba01f69d879b19a4a52d1e15014f109d9 (diff) | |
| download | latinime-fb961d1e15a6a0d917a4cfe0e69c8f5cd2dce0b8.tar.gz latinime-fb961d1e15a6a0d917a4cfe0e69c8f5cd2dce0b8.tar.xz latinime-fb961d1e15a6a0d917a4cfe0e69c8f5cd2dce0b8.zip | |
Merge "Build LatinIME with NDK r8"
| -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) |