diff options
| author |   satok <satok@satok-macbookpro.local> | 2010-07-17 19:20:35 +0900 |
|---|---|---|
| committer | satok <satok@satok-macbookpro.local> | 2010-07-17 19:20:35 +0900 |
| commit | 481a75fcfa81f0869f8e68c9f95390fb924ac2c5 (patch) | |
| tree | db7c2acdeaa1df16a545b17cdd2002046eb2004b /native/Android.mk | |
| parent | cbd4592fe1f2bce822044099246709f7802d5aa8 (diff) | |
| parent | 44f92495c1a916c89a603266977fb15a8c64372a (diff) | |
| download | latinime-481a75fcfa81f0869f8e68c9f95390fb924ac2c5.tar.gz latinime-481a75fcfa81f0869f8e68c9f95390fb924ac2c5.tar.xz latinime-481a75fcfa81f0869f8e68c9f95390fb924ac2c5.zip | |
Merge remote branch 'goog/master'
Conflicts:
java/src/com/android/inputmethod/latin/LatinIME.java
Diffstat (limited to 'native/Android.mk')
| -rw-r--r-- | native/Android.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/native/Android.mk b/native/Android.mk index 10ffdbf2a..de4f7eb01 100644 --- a/native/Android.mk +++ b/native/Android.mk @@ -8,8 +8,13 @@ LOCAL_SRC_FILES := \ src/dictionary.cpp \ src/char_utils.cpp -LOCAL_NDK_VERSION := 4 -LOCAL_SDK_VERSION := 8 +# NDK does not support sim build. +ifneq ($(TARGET_SIMULATOR),true) + LOCAL_NDK_VERSION := 4 + LOCAL_SDK_VERSION := 8 +else + LOCAL_C_INCLUDES += $(JNI_H_INCLUDE) +endif LOCAL_PRELINK_MODULE := false |