From f52c1c50ef71c4a30c65c1400394efbed6b2c4c9 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Fri, 6 Jul 2012 15:53:51 +0900 Subject: [PATCH] Revert "Fix the build" This reverts commit 48a436081fc6886dbeecf1f2b25fd754952f0fe1. --- native/jni/Android.mk | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/native/jni/Android.mk b/native/jni/Android.mk index c5cea1143..a7486ae90 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -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)