diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-07-05 23:59:53 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-07-05 23:59:53 -0700 |
| commit | 3378a244dc82ea19f5f2c363b579e18b6b873fca (patch) | |
| tree | e96a06a8cffd1db1c52bbb6170090ae7b6a31a4a | |
| parent | 01606c385bd336042296abf37b8d43a0687e03d0 (diff) | |
| parent | f52c1c50ef71c4a30c65c1400394efbed6b2c4c9 (diff) | |
| download | latinime-3378a244dc82ea19f5f2c363b579e18b6b873fca.tar.gz latinime-3378a244dc82ea19f5f2c363b579e18b6b873fca.tar.xz latinime-3378a244dc82ea19f5f2c363b579e18b6b873fca.zip | |
Merge "Revert "Fix the build""
| -rw-r--r-- | native/jni/Android.mk | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index c5cea1143..a7486ae90 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -68,12 +68,13 @@ endif # FLAG_DO_PROFILE LOCAL_MODULE := libjni_latinime_common_static LOCAL_MODULE_TAGS := optional -# In the platform build system +ifdef ANDROID_BUILD_TOP # In the platform build system include external/stlport/libstlport.mk -# In the unbundled build system -#LOCAL_NDK_VERSION := 7 -#LOCAL_SDK_VERSION := 14 -#LOCAL_NDK_STL_VARIANT := stlport_static +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) ###################################### @@ -95,12 +96,13 @@ endif # FLAG_DO_PROFILE LOCAL_MODULE := libjni_latinime LOCAL_MODULE_TAGS := optional -# In the platform build system +ifdef ANDROID_BUILD_TOP # In the platform build system LOCAL_STATIC_LIBRARIES += libstlport_static -# In the unbundled build system -#LOCAL_NDK_VERSION := 7 -#LOCAL_SDK_VERSION := 14 -#LOCAL_NDK_STL_VARIANT := stlport_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) |