Use system zlib

AerofoilAndroid/make_symlinks.bat

@@ -13,7 +13,6 @@ mklink /D app\jni\GpCommon ..\..\..\GpCommon
 mklink /D app\jni\GpFontHandler_FreeType2 ..\..\..\GpFontHandler_FreeType2
 mklink /D app\jni\PortabilityLayer ..\..\..\PortabilityLayer
 mklink /D app\jni\FreeType ..\..\..\FreeType
-mklink /D app\jni\zlib ..\..\..\zlib
 mklink /D app\jni\rapidjson ..\..\..\rapidjson
 mklink /D app\jni\MacRomanConversion ..\..\..\MacRomanConversion
 mklink /D app\jni\stb ..\..\..\stb

GpApp/Android.mk

@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/../Common	\
 	$(LOCAL_PATH)/../PortabilityLayer
 
-LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0
+LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0 -DGP_ZLIB_BUILTIN=1
 
 # Add your application source files here...
 LOCAL_SRC_FILES := \

PortabilityLayer/Android.mk

@@ -11,7 +11,9 @@ LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/../MacRomanConversion	\
 	$(LOCAL_PATH)/../stb
 
-LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0
+LOCAL_CFLAGS := -DGP_DEBUG_CONFIG=0 -DGP_ZLIB_BUILTIN=1
+
+LOCAL_EXPORT_LDLIBS := -lz
 
 # Add your application source files here...
 LOCAL_SRC_FILES := \
@@ -107,6 +109,6 @@ LOCAL_SRC_FILES := \
 	ZipFileProxy.cpp
 	
 
-LOCAL_STATIC_LIBRARIES := zlib MacRomanConversion stb
+LOCAL_STATIC_LIBRARIES := MacRomanConversion stb
 
 include $(BUILD_STATIC_LIBRARY)

PortabilityLayer/DeflateCodec.cpp

@@ -3,7 +3,11 @@
 #include "GpIOStream.h"
 #include "MemoryManager.h"
 
+#ifdef GP_ZLIB_BUILTIN
+#include <zlib.h>
+#else
 #include "zlib.h"
+#endif
 
 namespace
 {

zlib/Android.mk

@@ -1,19 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := zlib
-
-# Add your application source files here...
-LOCAL_SRC_FILES := \
-	adler32.c	\
-	crc32.c	\
-	deflate.c	\
-	inffast.c	\
-	inflate.c	\
-	inftrees.c	\
-	trees.c	\
-	zutil.c
-	
-
-include $(BUILD_STATIC_LIBRARY)