Fix the build

Change-Id: Iff324c705b46cfae27ea9b6b8dc8b0a0d56a193d
main
Ken Wakasa 2012-07-06 15:35:13 +09:00
parent 70ba3340a1
commit 48a436081f
1 changed files with 10 additions and 12 deletions

View File

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