aboutsummaryrefslogtreecommitdiffstats
path: root/native/Android.mk
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-12-29 14:55:20 -0800
committerJean-Baptiste Queru <jbq@google.com>2010-12-29 14:55:20 -0800
commit2912c654b42cae7fb8d537fc9068a0c5b1e86056 (patch)
tree8efd0ce6464092346ceb498e8f6f31947736e294 /native/Android.mk
parentf182f82378c3d07f2de68e2b9c0ef0f7d5272b52 (diff)
parent7b3e2b79dafd135cc2d0605775c03653fe31426d (diff)
downloadlatinime-2912c654b42cae7fb8d537fc9068a0c5b1e86056.tar.gz
latinime-2912c654b42cae7fb8d537fc9068a0c5b1e86056.tar.xz
latinime-2912c654b42cae7fb8d537fc9068a0c5b1e86056.zip
Manual merge from gingerbread-plus-aosp
Change-Id: If048354f9b80bcaa1e97df5c31c3df80231eb612
Diffstat (limited to 'native/Android.mk')
-rw-r--r--native/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/native/Android.mk b/native/Android.mk
index bbbff1efe..2de3892db 100644
--- a/native/Android.mk
+++ b/native/Android.mk
@@ -12,11 +12,13 @@ LOCAL_SRC_FILES := \
#FLAG_DBG := true
+ifneq ($(TARGET_ARCH),x86)
ifneq ($(FLAG_DBG), true)
LOCAL_NDK_VERSION := 4
endif
LOCAL_SDK_VERSION := 8
+endif #TARGET_ARCH = x86
LOCAL_MODULE := libjni_latinime