summaryrefslogtreecommitdiffstats
path: root/packaging/android/build.sh
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2018-08-05 15:07:46 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-08-05 15:08:19 -0700
commit32a630ece3b4612ef1b8a76d6cabbe8991e85025 (patch)
tree7e782e8733d56babee3166ab5fe9bd78c6503d3a /packaging/android/build.sh
parent9328726358e40cd4b8756742a81936a6d10f4e01 (diff)
downloadsubsurface-32a630ece3b4612ef1b8a76d6cabbe8991e85025.tar.gz
Android: build latest libzip
Small hacks needed, but otherwise this seems to work. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/android/build.sh')
-rwxr-xr-xpackaging/android/build.sh7
1 files changed, 7 insertions, 0 deletions
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 \