diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-13 20:02:48 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-13 20:02:48 -0800 |
| commit | 683eb93eef7832d39e1f121ce8115a41e2e77b2e (patch) | |
| tree | 289f735f8525c0eccc56049ec2abca977ae05f72 /Android.mk | |
| parent | 714598851d81e2b38d6f8105d60056c28110967b (diff) | |
| parent | 30407b3fb9d461c2be733daffeadcb0d46b669b2 (diff) | |
| download | zlib-683eb93eef7832d39e1f121ce8115a41e2e77b2e.tar.gz | |
am 30407b3f: Merge "[MIPS] Use NDK libs for ARM builds only"
* commit '30407b3fb9d461c2be733daffeadcb0d46b669b2':
[MIPS] Use NDK libs for ARM builds only
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -26,7 +26,7 @@ LOCAL_MODULE := libz 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 := libz 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 @@ include $(CLEAR_VARS) 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 |