build zlib and minigzipandroid-sdk-tools_r2android-sdk-1.6_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-1.6_r2android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1donut-release2donut-releasedonut

Build zlib as a device static library (so we can use it in recovery)
and as a host static library (so we can use it in OTA-building
tools).  Also build minigzip as a host executable, so we can use it in
the build in place of gzip.

1 files changed, 31 insertions, 4 deletions

diff --git a/Android.mk b/Android.mk
index 4ea9613..657e3a6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,7 +5,7 @@ include $(CLEAR_VARS)
 # than the thumb one...
 LOCAL_ARM_MODE := arm
 
-LOCAL_SRC_FILES:= \
+zlib_files := \
 	adler32.c \
 	compress.c \
 	crc32.c \
@@ -19,11 +19,26 @@ LOCAL_SRC_FILES:= \
 	inftrees.c \
 	inffast.c
 
-LOCAL_MODULE:= libz
+LOCAL_MODULE := libz
+LOCAL_CFLAGS += -O3 -DUSE_MMAP
+LOCAL_SRC_FILES := $(zlib_files)
+include $(BUILD_SHARED_LIBRARY)
 
-LOCAL_CFLAGS+= -O3 -DUSE_MMAP
+include $(CLEAR_VARS)
 
-include $(BUILD_SHARED_LIBRARY)
+LOCAL_ARM_MODE := arm
+LOCAL_MODULE := libz
+LOCAL_CFLAGS += -O3 -DUSE_MMAP
+LOCAL_SRC_FILES := $(zlib_files)
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+LOCAL_MODULE := libz
+LOCAL_CFLAGS += -O3 -DUSE_MMAP
+LOCAL_SRC_FILES := $(zlib_files)
+include $(BUILD_HOST_STATIC_LIBRARY)
 
 
 
@@ -57,3 +72,15 @@ LOCAL_MODULE:= gzip
 LOCAL_SHARED_LIBRARIES := libz
 
 include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES:=        \
+	minigzip.c
+
+LOCAL_MODULE:= minigzip
+
+LOCAL_STATIC_LIBRARIES := libz
+
+include $(BUILD_HOST_EXECUTABLE)
+