commit | 2912c654b42cae7fb8d537fc9068a0c5b1e86056 | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Wed Dec 29 14:55:20 2010 -0800 |
committer | Jean-Baptiste Queru <jbq@google.com> | Wed Dec 29 14:55:20 2010 -0800 |
tree | 8efd0ce6464092346ceb498e8f6f31947736e294 | |
parent | f182f82378c3d07f2de68e2b9c0ef0f7d5272b52 [diff] | |
parent | 7b3e2b79dafd135cc2d0605775c03653fe31426d [diff] |
Manual merge from gingerbread-plus-aosp Change-Id: If048354f9b80bcaa1e97df5c31c3df80231eb612
diff --git a/native/Android.mk b/native/Android.mk index bbbff1e..2de3892 100644 --- a/native/Android.mk +++ b/native/Android.mk
@@ -12,11 +12,13 @@ #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