commit d650ab53036c6177502b6fb3c2ece776a22a882a
author Tadashi G. Takaoka <takaoka@google.com> Wed Jan 12 17:46:36 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 12 17:46:36 2011 -0800
tree ae103964c4430d05edf32c687d851e36e96f41e0
parent 5cc23550429ea12be7ecdb07fc7b9060c8465dc7
parent 07a0fd0f5100a0cee978ba07751d63595c9d27ac

am 07a0fd0f: Reset old keyboard state before switching to new keyboard (DO NOT MERGE)

* commit '07a0fd0f5100a0cee978ba07751d63595c9d27ac':
  Reset old keyboard state before switching to new keyboard (DO NOT MERGE)

native/Android.mk

diff --git a/native/Android.mk b/native/Android.mk
index b294469..94e0298 100644
--- a/native/Android.mk
+++ b/native/Android.mk
@@ -8,8 +8,10 @@
 	src/dictionary.cpp \
 	src/char_utils.cpp
 
+ifneq ($(TARGET_ARCH),x86)
 LOCAL_NDK_VERSION := 4
 LOCAL_SDK_VERSION := 8
+endif
 
 LOCAL_MODULE := libjni_latinime