diff options
Diffstat (limited to 'native')
| -rw-r--r-- | native/jni/Android.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 419318513..a7486ae90 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -68,9 +68,13 @@ endif # FLAG_DO_PROFILE LOCAL_MODULE := libjni_latinime_common_static LOCAL_MODULE_TAGS := optional +ifdef ANDROID_BUILD_TOP # 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 include $(BUILD_STATIC_LIBRARY) ###################################### @@ -92,9 +96,13 @@ endif # FLAG_DO_PROFILE LOCAL_MODULE := libjni_latinime LOCAL_MODULE_TAGS := optional +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) |