[tor-commits] [tor-browser-build/master] Bug 33685: Add Support for Building zlib for Android

[boklm at torproject.org]

commit cc6e1439cdc0bc393ce7c3c2ece47cc2d9abed4f
Author: sisbell <shane.isbell at gmail.com>
Date:   Sat Mar 21 16:48:11 2020 -0700

    Bug 33685:  Add Support for Building zlib for Android
---
 projects/zlib/build | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/projects/zlib/build b/projects/zlib/build
index fe1377f..5ee00d5 100644
--- a/projects/zlib/build
+++ b/projects/zlib/build
@@ -5,8 +5,20 @@ distdir=/var/tmp/dist/[% project %]
 mkdir -p /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]
-make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"
-make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install
+[% IF c("var/windows") -%]
+  make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]"
+  make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install
+[% END -%]
+
+[% IF c("var/android") -%]
+  export CHOST=[% c("var/configure_host") %]
+  export CC="clang"
+  ./configure --prefix=$distdir
+  make -j[% c("buildconf/num_procs") %]
+  make -j[% c("buildconf/num_procs") %] install
+  # Only need static libraries
+  rm -r $distdir/lib/{*.so*,pkgconfig}
+[% END -%]
 
 cd /var/tmp/dist
 [% c('tar', {