nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Ken Wakasa 2012-07-26 23:47:27 -07:00 committed by Android (Google) Code Review
commit 42e7a1e5c1
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
native/jni/Android.mk
View file

@ -69,14 +69,9 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime_common_static LOCAL_MODULE := libjni_latinime_common_static
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
# TODO: Remove this conditional block once we have no issues with building against NDK LOCAL_NDK_VERSION := 8
ifndef TARGET_BUILD_APPS # A full system image build
include external/stlport/libstlport.mk
else # An unbundled build
LOCAL_NDK_VERSION := 7
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := stlport_static LOCAL_NDK_STL_VARIANT := stlport_static
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
###################################### ######################################
@ -98,14 +93,9 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
# TODO: Remove this conditional block once we have no issues with building against NDK LOCAL_NDK_VERSION := 8
ifndef TARGET_BUILD_APPS # A full system image build
LOCAL_STATIC_LIBRARIES += libstlport_static
else # An unbundled build
LOCAL_NDK_VERSION := 7
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := stlport_static LOCAL_NDK_STL_VARIANT := stlport_static
endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)