[tbb-commits] [tor-browser-build/master] Bug 34187: Update zlib to use Android NDK 20

[sysrqb at torproject.org]

commit 444771b80e706d047199eae24658acc4d52dd983
Author: Georg Koppen <gk at torproject.org>
Date:   Tue May 12 15:00:16 2020 +0000

    Bug 34187: Update zlib to use Android NDK 20
---
 projects/zlib/build | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/projects/zlib/build b/projects/zlib/build
index 5ee00d5..a60e037 100644
--- a/projects/zlib/build
+++ b/projects/zlib/build
@@ -11,8 +11,13 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
 [% END -%]
 
 [% IF c("var/android") -%]
-  export CHOST=[% c("var/configure_host") %]
-  export CC="clang"
+  [% IF c("var/android-fenix") -%]
+    export CHOST=[% c("var/cross_prefix") %]
+    export CC=[% c("var/CC") %]
+  [% ELSE -%]
+    export CHOST=[% c("var/configure_host") %]
+    export CC="clang"
+  [% END -%]
   ./configure --prefix=$distdir
   make -j[% c("buildconf/num_procs") %]
   make -j[% c("buildconf/num_procs") %] install