diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-03-31 05:07:32 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2012-03-31 05:07:32 +0900 |
| commit | 0c1a3ec629a7df8e5dcf0cc000b68c8f1a809a40 (patch) | |
| tree | 070f4e683d3759165bafe2068068354c5b9dbd27 | |
| parent | f24d1102ac788f4ff656a9cd5eab6d3c2c584698 (diff) | |
| download | latinime-0c1a3ec629a7df8e5dcf0cc000b68c8f1a809a40.tar.gz latinime-0c1a3ec629a7df8e5dcf0cc000b68c8f1a809a40.tar.xz latinime-0c1a3ec629a7df8e5dcf0cc000b68c8f1a809a40.zip | |
Make LatinIME's native Makefile NDK-friendly
Change-Id: I55d430756b3a8251c9ff49dfabfcecb047d979a4
| -rw-r--r-- | native/jni/Android.mk | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index f41d6916e..5e0d3518d 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -87,7 +87,12 @@ endif # FLAG_DO_PROFILE LOCAL_MODULE := libjni_latinime_static LOCAL_MODULE_TAGS := optional +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 + include $(BUILD_STATIC_LIBRARY) ###################################### @@ -95,7 +100,12 @@ include $(CLEAR_VARS) # All code in LOCAL_WHOLE_STATIC_LIBRARIES will be built into this shared library. LOCAL_WHOLE_STATIC_LIBRARIES := libjni_latinime_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) @@ -115,7 +125,10 @@ endif LOCAL_MODULE := libjni_latinime LOCAL_MODULE_TAGS := optional +ifdef HISTORICAL_NDK_VERSIONS_ROOT # In the platform build system include external/stlport/libstlport.mk +endif + include $(BUILD_SHARED_LIBRARY) #################### Clean up the tmp vars |