diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-13 15:16:14 -0800 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-02-13 15:16:15 -0800 |
| commit | 30407b3fb9d461c2be733daffeadcb0d46b669b2 (patch) | |
| tree | f57c8e5b211633bd14310e582dd116f8f9ebb2e7 | |
| parent | 69e5801bd16a495e1c1666669fe827b1ddb8d56b (diff) | |
| parent | 82d97a3ecfe317b3edbabc90a374a2a13a41e75c (diff) | |
| download | zlib-ics-plus-aosp.tar.gz | |
Merge "[MIPS] Use NDK libs for ARM builds only"android-sdk-adt_r20tools_r20ics-plus-aosp
| -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 @@ -74,7 +74,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(unzip_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 |