From 32a630ece3b4612ef1b8a76d6cabbe8991e85025 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Sun, 5 Aug 2018 15:07:46 -0700
Subject: [PATCH] Android: build latest libzip

Small hacks needed, but otherwise this seems to work.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 packaging/android/build.sh | 7 +++++++
 scripts/get-dep-lib.sh     | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index 3d62c4520..c036bc7ba 100755
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -216,6 +216,13 @@ fi
 
 "${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libzip
 if [ ! -e "$PKG_CONFIG_LIBDIR/libzip.pc" ] ; then
+	# libzip expects a predefined macro that isn't there for our compiler
+	pushd libzip
+	git reset --hard
+	sed -i 's/SIZEOF_SIZE_T/__SIZEOF_SIZE_T__/g' lib/compat.h
+	# also, don't deal with manuals and bzip2
+	sed -i 's/ADD_SUBDIRECTORY(man)//;s/FIND_PACKAGE(BZip2)/# FIND_PACKAGE(BZip2)/' CMakeLists.txt
+	popd
 	mkdir -p libzip-build-"$ARCH"
 	pushd libzip-build-"$ARCH"
 	cmake \
diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh
index e87b294cf..fbb689f77 100755
--- a/scripts/get-dep-lib.sh
+++ b/scripts/get-dep-lib.sh
@@ -100,7 +100,6 @@ fi
 
 # FIX FOR ANDROID,
 if [ "$PLATFORM" == "singleAndroid" ] ; then
-	CURRENT_LIBZIP="rel-1-1-3"
 	CURRENT_OPENSSL="OpenSSL_1_0_2o"
 # If changing the openSSL version here, make sure to change it in versions.sh also.
 fi