boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 84af6965 by Nicolas Vigier at 2026-03-02T18:27:45+01:00 Bug 41744: Reduce duplication between projects/geckoview/build and projects/geckoview/build_apk - - - - - 3 changed files: - projects/geckoview/build - projects/geckoview/build_apk - projects/geckoview/build_common Changes: ===================================== projects/geckoview/build ===================================== @@ -1,26 +1,20 @@ #!/bin/bash -[% INCLUDE 'build_common' %] +[% c("var/set_default_env") -%] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] +mkdir -p /var/tmp/dist +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/rust') %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/cbindgen') %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/nasm') %] +tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/clang') %] export LLVM_CONFIG="/var/tmp/dist/clang-linux/bin/llvm-config" export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/clang-linux/bin:$PATH" [% IF c("var/rlbox") -%] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/wasi-sysroot') %] export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/ [% END -%] -cd /var/tmp/build/[% project %]-[% c("version") %] -cp $rootdir/mozconfig ./ - -echo "Starting ./mach configure $(date)" -./mach configure \ - [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \ - [% IF !c("var/firefox-browser") %]--with-branding=$branding_dir[% END %] \ - [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] +[% INCLUDE 'build_common' %] echo "Starting ./mach build $(date)" ./mach build --verbose [% IF c('var/generate_gradle_dependencies_list') %]2>&1 | tee -a $gradle_logs[% END %] ===================================== projects/geckoview/build_apk ===================================== @@ -1,10 +1,15 @@ #!/bin/bash -[% INCLUDE 'build_common' %] +[% c("var/set_default_env") -%] -echo "Starting the creation of the fat AAR $(date)" +# Specify the architectures we want to merge +export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86_64 +export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$rootdir/[% c('input_files_by_name/geckoview_armv7') %]/geckoview/target.maven.zip +export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/geckoview/target.maven.zip +export MOZ_ANDROID_FAT_AAR_X86_64=$rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/geckoview/target.maven.zip -tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] +[% INCLUDE 'build_common' %] +./mach build --verbose [% IF c("var/dev_artifacts") -%] mkdir -p $outdir/[% project %]/artifacts/armeabi-v7a @@ -15,22 +20,4 @@ tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') % mv $rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/artifacts/* $outdir/[% project %]/artifacts/x86_64 [% END -%] -# Specify the architectures we want to merge -export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86_64 -export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$rootdir/[% c('input_files_by_name/geckoview_armv7') %]/geckoview/target.maven.zip -export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/geckoview/target.maven.zip -export MOZ_ANDROID_FAT_AAR_X86_64=$rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/geckoview/target.maven.zip - -cd $builddir/[% project %]-[% c("version") %] -cp $rootdir/mozconfig ./ - -# We still need to specify --base-browser-version due to bug 34005. -./mach configure \ - --with-base-browser-version=[% c("var/torbrowser_version") %] \ - --enable-update-channel=[% c("var/variant") %] \ - --with-branding=$branding_dir \ - [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] - -./mach build --verbose - [% INCLUDE 'build_ac_fenix' %] ===================================== projects/geckoview/build_common ===================================== @@ -1,4 +1,3 @@ -[% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')), }) %] @@ -82,3 +81,13 @@ touch $HOME/.mozbuild/android-device/avd chmod +x $HOME/.mozbuild/android-device/avd [% INCLUDE 'browser-localization' %] + +cd $builddir/[% project %]-[% c("version") %] +cp $rootdir/mozconfig ./ + +echo "Starting ./mach configure $(date)" +# We still need to specify --base-browser-version due to bug 34005. +./mach configure \ + [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \ + [% IF !c("var/firefox-browser") %]--with-branding=$branding_dir[% END %] \ + [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/84... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/84... You're receiving this email because of your account on gitlab.torproject.org.