[tor-commits] [tor-browser-build/master] Bug 34219: Enable ZSTD support on Android

[sysrqb at torproject.org]

commit 40809c54c2e198cbe11d0d4f19bc9fd7c242166b
Author: Georg Koppen <gk at torproject.org>
Date:   Thu May 14 13:29:38 2020 +0000

    Bug 34219: Enable ZSTD support on Android
---
 projects/tor/build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/projects/tor/build b/projects/tor/build
index 30ecc7e..7747549 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -8,6 +8,10 @@ mkdir -p /var/tmp/build
   TORCONFIGDIR="$distdir/assets/common"
   libsdir=$distdir/jniLibs/[% c("var/abi") %]
   mkdir -p $libsdir $TORCONFIGDIR "$distdir/Tor"
+  # We need to make sure our ZSTD dependencey is properly picked up.
+  # --enable-zstd is not enough.
+  export ZSTD_CFLAGS=-I/var/tmp/dist/zstd/include
+  export ZSTD_LIBS=/var/tmp/dist/zstd/lib/libzstd.a
 [% END %]
 
 [% IF c("var/linux") || c("var/windows") %]