Skip to content
Snippets Groups Projects
Commit 42e7a1e5 authored by Ken Wakasa's avatar Ken Wakasa Committed by Android (Google) Code Review
Browse files

Merge "Build LatinIME with NDK r8" into jb-mr1-dev

parents 99906b3f d3e10bb6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 12 deletions
native/jni/Android.mk
+ 2
− 12
View file @ 42e7a1e5
......@@ -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)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment