From c646102b94533e1b5d160dcd101de40bce27c4cb Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Fri, 6 Jul 2012 15:17:11 +0900
Subject: [PATCH] Update Makefile of LatinIME native code for the unbundled
build
Change-Id: I117e2429c5f5e75a6ffe84b5869afb2e033f2b2d
---
native/jni/Android.mk | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index d40063ed5a..a7486ae901 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -68,10 +68,12 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime_common_static
LOCAL_MODULE_TAGS := optional
-ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system
+ifdef ANDROID_BUILD_TOP # In the platform build system
include external/stlport/libstlport.mk
-else # In the NDK build system
-LOCAL_C_INCLUDES += external/stlport/stlport bionic
+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)
@@ -81,12 +83,6 @@ include $(CLEAR_VARS)
# All code in LOCAL_WHOLE_STATIC_LIBRARIES will be built into this shared library.
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)
$(warning Making profiling version of native library)
LOCAL_SHARED_LIBRARIES += libcutils libutils
@@ -100,8 +96,12 @@ endif # FLAG_DO_PROFILE
LOCAL_MODULE := libjni_latinime
LOCAL_MODULE_TAGS := optional
-ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system
-include external/stlport/libstlport.mk
+ifdef ANDROID_BUILD_TOP # 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
include $(BUILD_SHARED_LIBRARY)
--
GitLab