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

Revert "Fix the build" 

This reverts commit 48a436081f.
main
Ken Wakasa 2012-07-06 15:53:51 +09:00
parent 48a436081f
commit f52c1c50ef
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
native/jni/Android.mk
View File

@ -68,12 +68,13 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime_common_static
LOCAL_MODULE_TAGS := optional
# In the platform build system
ifdef ANDROID_BUILD_TOP # In the platform build system
include external/stlport/libstlport.mk
# In the unbundled build system
#LOCAL_NDK_VERSION := 7
#LOCAL_SDK_VERSION := 14
#LOCAL_NDK_STL_VARIANT := stlport_static
else # In the unbundled build system
LOCAL_NDK_VERSION := 7
LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := stlport_static
endif
include $(BUILD_STATIC_LIBRARY)
######################################
@ -95,12 +96,13 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := optional
# In the platform build system
ifdef ANDROID_BUILD_TOP # In the platform build system
LOCAL_STATIC_LIBRARIES += libstlport_static
# In the unbundled build system
#LOCAL_NDK_VERSION := 7
#LOCAL_SDK_VERSION := 14
#LOCAL_NDK_STL_VARIANT := stlport_static
else # In the unbundled build system
LOCAL_NDK_VERSION := 7
LOCAL_SDK_VERSION := 14
LOCAL_NDK_STL_VARIANT := stlport_static
endif
include $(BUILD_SHARED_LIBRARY)