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

Merge "Update Makefile of LatinIME native code for the unbundled build"

Browse source
This commit is contained in:
Ken Wakasa 2012-07-05 23:19:45 -07:00 committed by Android (Google) Code Review
commit 70ba3340a1
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
native/jni/Android.mk
View file

@ -68,10 +68,12 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime_common_static LOCAL_MODULE := libjni_latinime_common_static
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system ifdef ANDROID_BUILD_TOP # In the platform build system
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
else # In the NDK build system else # In the unbundled build system
LOCAL_C_INCLUDES += external/stlport/stlport bionic LOCAL_NDK_VERSION := 7
LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := stlport_static
endif endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@ -81,12 +83,6 @@ include $(CLEAR_VARS)
# All code in LOCAL_WHOLE_STATIC_LIBRARIES will be built into this shared library. # All code in LOCAL_WHOLE_STATIC_LIBRARIES will be built into this shared library.
LOCAL_WHOLE_STATIC_LIBRARIES := libjni_latinime_common_static LOCAL_WHOLE_STATIC_LIBRARIES := libjni_latinime_common_static
ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system
LOCAL_SHARED_LIBRARIES := libstlport
else # In the NDK build system
LOCAL_SHARED_LIBRARIES := libstlport_static
endif
ifeq ($(FLAG_DO_PROFILE), true) ifeq ($(FLAG_DO_PROFILE), true)
$(warning Making profiling version of native library) $(warning Making profiling version of native library)
LOCAL_SHARED_LIBRARIES += libcutils libutils LOCAL_SHARED_LIBRARIES += libcutils libutils
@ -100,8 +96,12 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system ifdef ANDROID_BUILD_TOP # In the platform build system
include external/stlport/libstlport.mk LOCAL_STATIC_LIBRARIES += libstlport_static
else # In the unbundled build system
LOCAL_NDK_VERSION := 7
LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := stlport_static
endif endif
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)