commit 683eb93eef7832d39e1f121ce8115a41e2e77b2e
author Jean-Baptiste Queru <jbq@google.com> Mon Feb 13 20:02:48 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 13 20:02:48 2012 -0800
tree 289f735f8525c0eccc56049ec2abca977ae05f72
parent 714598851d81e2b38d6f8105d60056c28110967b
parent 30407b3fb9d461c2be733daffeadcb0d46b669b2

am 30407b3f: Merge "[MIPS] Use NDK libs for ARM builds only"

* commit '30407b3fb9d461c2be733daffeadcb0d46b669b2':
  [MIPS] Use NDK libs for ARM builds only

Android.mk

diff --git a/Android.mk b/Android.mk
index 0e6ae67..db069cf 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,7 +26,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -O3 -DUSE_MMAP
 LOCAL_SRC_FILES := $(zlib_files)
-ifneq ($(TARGET_ARCH),x86)
+ifeq ($(TARGET_ARCH),arm)
   LOCAL_NDK_VERSION := 5
   LOCAL_SDK_VERSION := 9
 endif
@@ -39,7 +39,7 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS += -O3 -DUSE_MMAP
 LOCAL_SRC_FILES := $(zlib_files)
-ifneq ($(TARGET_ARCH),x86)
+ifeq ($(TARGET_ARCH),arm)
   LOCAL_NDK_VERSION := 5
   LOCAL_SDK_VERSION := 9
 endif
@@ -73,7 +73,7 @@
 LOCAL_SRC_FILES := $(zlib_files)
 LOCAL_MODULE:= libunz
 LOCAL_ARM_MODE := arm
-ifneq ($(TARGET_ARCH),x86)
+ifeq ($(TARGET_ARCH),arm)
   LOCAL_NDK_VERSION := 5
   LOCAL_SDK_VERSION := 9
 endif