diff options
| author |   Amith Yamasani <yamasani@google.com> | 2010-08-31 12:14:53 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-08-31 12:14:53 -0700 |
| commit | 725e94482d52e76aa4d9a9720a55289b528b47d8 (patch) | |
| tree | b79b27819ffa15e2b4d2ac65a86bea0a96d446f4 | |
| parent | cc7424498f63712077e8e4009932b22fabdc1e38 (diff) | |
| parent | ca4e42785f598af9f24a9e3e2ae644ffa83c77ed (diff) | |
| download | latinime-725e94482d52e76aa4d9a9720a55289b528b47d8.tar.gz latinime-725e94482d52e76aa4d9a9720a55289b528b47d8.tar.xz latinime-725e94482d52e76aa4d9a9720a55289b528b47d8.zip | |
am ca4e4278: Fix UnsatisfiedLinkError for Latin IME. Don\'t use old NDK version in a platform build.
Merge commit 'ca4e42785f598af9f24a9e3e2ae644ffa83c77ed' into gingerbread-plus-aosp
* commit 'ca4e42785f598af9f24a9e3e2ae644ffa83c77ed':
Fix UnsatisfiedLinkError for Latin IME. Don't use old NDK version in a platform build.
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | native/Android.mk | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 7cdf69a6a..44ff0a29d 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -47,6 +47,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/LatinIME*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/LatinIME.apk) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/native/Android.mk b/native/Android.mk index b2944699c..e9ceceb71 100644 --- a/native/Android.mk +++ b/native/Android.mk @@ -8,8 +8,8 @@ LOCAL_SRC_FILES := \ src/dictionary.cpp \ src/char_utils.cpp -LOCAL_NDK_VERSION := 4 -LOCAL_SDK_VERSION := 8 +#LOCAL_NDK_VERSION := 4 +#LOCAL_SDK_VERSION := 8 LOCAL_MODULE := libjni_latinime |