diff options
| author | Ying Wang <wangying@google.com> | 2011-10-03 18:01:44 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-10-03 18:01:44 -0700 |
| commit | 69e5801bd16a495e1c1666669fe827b1ddb8d56b (patch) | |
| tree | c43eeb136ada725613d0e1e9d1e703d512b56700 | |
| parent | 96c70b1df1629d7f0eb8f666045bfd5eb062cebf (diff) | |
| download | zlib-ics-mr1.tar.gz | |
Build zlib against NDK.android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-release
Change-Id: Ifc4c37d9580cbeb5c735bce811d0ceff58d93019
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -26,6 +26,10 @@ LOCAL_MODULE := libz LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) +ifneq ($(TARGET_ARCH),x86) + LOCAL_NDK_VERSION := 5 + LOCAL_SDK_VERSION := 9 +endif include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -35,6 +39,10 @@ LOCAL_MODULE := libz LOCAL_MODULE_TAGS := optional LOCAL_CFLAGS += -O3 -DUSE_MMAP LOCAL_SRC_FILES := $(zlib_files) +ifneq ($(TARGET_ARCH),x86) + LOCAL_NDK_VERSION := 5 + LOCAL_SDK_VERSION := 9 +endif include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -66,6 +74,10 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(unzip_files) LOCAL_MODULE:= libunz LOCAL_ARM_MODE := arm +ifneq ($(TARGET_ARCH),x86) + LOCAL_NDK_VERSION := 5 + LOCAL_SDK_VERSION := 9 +endif include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -89,4 +101,3 @@ LOCAL_MODULE:= minigzip LOCAL_STATIC_LIBRARIES := libz include $(BUILD_HOST_EXECUTABLE) - |