[tor-commits] [tor-browser-build/master] Bug 33564: Upgrade ZSTD to use Android NDK 20

[sysrqb at torproject.org]

commit caf2a191836a82ca5429a5dbd9b29e7c00746373
Author: sisbell <shane.isbell at gmail.com>
Date:   Mon Mar 30 10:43:05 2020 -0700

    Bug 33564: Upgrade ZSTD to use Android NDK 20
---
 projects/zstd/build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/projects/zstd/build b/projects/zstd/build
index 3d76a1a..b78d518 100644
--- a/projects/zstd/build
+++ b/projects/zstd/build
@@ -7,7 +7,11 @@ mkdir -p /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]
 export CPPFLAGS=-DZSTD_MULTITHREAD
-export CC=[% c("var/configure_host") %]-clang
+[% IF c("var/android-fenix") -%]
+  export CC=[% c("var/CC") %]
+[% ELSE -%]
+  export CC=[% c("var/configure_host") %]-clang
+[% END -%]
 make -C lib -j[% c("buildconf/num_procs") %] PREFIX=$distdir install
 # Only need static libraries
 rm $distdir/lib/libzstd.so*