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

Fix jb-ub-latinimegoogle build 

Change-Id: I38829600b86309c90f831cfd0bf8f66b02ce524a
main
Ken Wakasa 2012-07-06 12:52:20 +09:00
parent 881a162ab8
commit b8add1a24e
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
native/jni/Android.mk
View File

@ -70,12 +70,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_NDK_VERSION := 7 LOCAL_NDK_VERSION := 7
LOCAL_SDK_VERSION := 14 LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := stlport_static
ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system
include external/stlport/libstlport.mk
else # In the NDK build system
LOCAL_C_INCLUDES += external/stlport/stlport bionic
endif
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
###################################### ######################################
@ -84,12 +79,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
@ -103,9 +92,9 @@ 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 LOCAL_NDK_VERSION := 7
include external/stlport/libstlport.mk LOCAL_SDK_VERSION := 14
endif LOCAL_NDK_STL_VARIANT := stlport_static
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)