diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-07-06 12:52:20 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2012-07-06 12:52:20 +0900 |
| commit | b8add1a24ea60d28bf2436f675326f34b6a13ac1 (patch) | |
| tree | 9cbf77344548e02c30d64ad57e1113dd28bde4b3 | |
| parent | 881a162ab8824b2ac06f7d8b16295abd0823caa0 (diff) | |
| download | latinime-b8add1a24ea60d28bf2436f675326f34b6a13ac1.tar.gz latinime-b8add1a24ea60d28bf2436f675326f34b6a13ac1.tar.xz latinime-b8add1a24ea60d28bf2436f675326f34b6a13ac1.zip | |
Fix jb-ub-latinimegoogle build
Change-Id: I38829600b86309c90f831cfd0bf8f66b02ce524a
| -rw-r--r-- | native/jni/Android.mk | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index f7eebcee1..419318513 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -70,12 +70,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_NDK_VERSION := 7 LOCAL_SDK_VERSION := 14 - -ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system -include external/stlport/libstlport.mk -else # In the NDK build system -LOCAL_C_INCLUDES += external/stlport/stlport bionic -endif +LOCAL_NDK_STL_VARIANT := stlport_static include $(BUILD_STATIC_LIBRARY) ###################################### @@ -84,12 +79,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 @@ -103,9 +92,9 @@ 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 -endif +LOCAL_NDK_VERSION := 7 +LOCAL_SDK_VERSION := 14 +LOCAL_NDK_STL_VARIANT := stlport_static include $(BUILD_SHARED_LIBRARY) |