[tbb-commits] [tor-browser-build/master] Bug 33563: Upgrade Tor to use Android NDK 20

[sysrqb at torproject.org]

commit 56578679ab388a1b06e70ab68c6a89bdaaec0cbb
Author: Georg Koppen <gk at torproject.org>
Date:   Fri May 15 11:27:10 2020 +0000

    Bug 33563: Upgrade Tor to use Android NDK 20
    
    We remove --libdir as well for the Fenix toolchain as it does nothing
    (and would be wrongly used anyway if pointing to ANDROID_NDK_HOME).
---
 projects/tor/build  | 6 +++++-
 projects/tor/config | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/projects/tor/build b/projects/tor/build
index 7747549..4345d35 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -148,7 +148,11 @@ cd $distdir
 [% END %]
 
 [% IF c("var/android") %]
-  install -s --strip-program=[% c("var/configure_host") %]-strip $distdir/bin/tor $libsdir/libTor.so
+  [% IF c("var/android-fenix") %]
+    install -s --strip-program=[% c("var/cross_prefix") %]-strip $distdir/bin/tor $libsdir/libTor.so
+  [% ELSE %]
+    install -s --strip-program=[% c("var/configure_host") %]-strip $distdir/bin/tor $libsdir/libTor.so
+  [% END %]
 [% END %]
 
 mkdir -p [% dest_dir _ '/' _ c('filename') %]
diff --git a/projects/tor/config b/projects/tor/config
index 72d7a8a..8fec5b2 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -47,7 +47,7 @@ targets:
       flag_mwindows: ''
   android:
     var:
-      configure_opt_project: --libdir=$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/lib --enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc
+      configure_opt_project: '[% IF !c("var/android-fenix") %]--libdir=$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/lib [% END %]--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc'
       arch_deps:
         - libtinfo5