[tor-commits] [tor-browser-build/master] Bug 40001: Don't bundle geckodriver in debug builds

[sysrqb at torproject.org]

commit a6e6caf5f11b578d7a177c519ca0d2bbb9a154dd
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jun 18 08:11:13 2020 +0000

    Bug 40001: Don't bundle geckodriver in debug builds
---
 projects/firefox/build     | 18 +++++++++++-------
 projects/tor-browser/build |  4 +++-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index cd0d6b5..16984f3 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -160,7 +160,7 @@ rm -f js/src/configure
 [% END %]
 
 [% IF c("var/linux") %]
-  [% IF c("var/linux-x86_64") %]
+  [% IF c("var/linux-x86_64") && !c("var/asan") %]
     cp obj-*/testing/geckodriver/x86_64-unknown-linux-gnu/release/geckodriver $distdir
   [% END %]
   cp -a obj-*/dist/firefox/* $distdir/Browser/
@@ -225,8 +225,10 @@ cp -p obj-*/dist/host/bin/mbsdiff $MARTOOLS/
 cd $distdir
 
 [% IF c("var/linux-x86_64") %]
-  # No need for an unstripped geckodriver
-  strip geckodriver
+  [% IF !c("var/asan") %]
+    # No need for an unstripped geckodriver
+    strip geckodriver
+  [% END %]
   mkdir -p $distdir/Debug/Browser/gtk2
   # Strip and generate debuginfo for the firefox binary that we keep, all *.so
   # files, the plugin-container, and the updater (see ticket #10126)
@@ -272,10 +274,12 @@ END;
         tar_src => [ 'Debug' ],
         tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-browser-debug.tar.xz',
     }) %]
-[% c('tar', {
-        tar_src => [ 'geckodriver' ],
-        tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/geckodriver-linux64.tar.xz',
-    }) %]
+  [% IF !c("var/asan") %]
+    [% c('tar', {
+            tar_src => [ 'geckodriver' ],
+            tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/geckodriver-linux64.tar.xz',
+        }) %]
+  [% END %]
 [% END %]
 
 [% c('zip', {
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index b9732e8..386ea26 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -293,7 +293,9 @@ SCRIPT_EOF
 cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
 [% IF c("var/linux-x86_64") -%]
   cp $rootdir/[% c('input_files_by_name/firefox') %]/tor-browser-debug.tar.xz "$OUTDIR"/tor-browser-[% c("var/mar_osname") %]-debug.tar.xz
-  cp $rootdir/[% c('input_files_by_name/firefox') %]/geckodriver-linux64.tar.xz "$OUTDIR"/
+  [% IF !c("var/asan") -%]
+    cp $rootdir/[% c('input_files_by_name/firefox') %]/geckodriver-linux64.tar.xz "$OUTDIR"/
+  [% END -%]
 [% END -%]
 [% IF c("var/linux") -%]
   cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz