commit 69e5801bd16a495e1c1666669fe827b1ddb8d56b
author Ying Wang <wangying@google.com> Mon Oct 03 18:01:44 2011 -0700
committer Ying Wang <wangying@google.com> Mon Oct 03 18:01:44 2011 -0700
tree c43eeb136ada725613d0e1e9d1e703d512b56700
parent 96c70b1df1629d7f0eb8f666045bfd5eb062cebf

Build zlib against NDK.

Change-Id: Ifc4c37d9580cbeb5c735bce811d0ceff58d93019

Android.mk

diff --git a/Android.mk b/Android.mk
index 9c4c500..a46bc63 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,6 +26,10 @@
 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_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 @@
 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_STATIC_LIBRARIES := libz
 
 include $(BUILD_HOST_EXECUTABLE)
-