commit 48a436081fc6886dbeecf1f2b25fd754952f0fe1
author Ken Wakasa <kwakasa@google.com> Fri Jul 06 15:35:13 2012 +0900
committer Ken Wakasa <kwakasa@google.com> Fri Jul 06 15:35:13 2012 +0900
tree 3fa90e8ed25520b781fab2a6d04fb3c1801e7568
parent 70ba3340a1175c3d789ab99d2a847f50b90d7765

Fix the build

Change-Id: Iff324c705b46cfae27ea9b6b8dc8b0a0d56a193d

native/jni/Android.mk

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index a7486ae..c5cea11 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -68,13 +68,12 @@
 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 @@
 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)