Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 43f7cf99 by Pier Angelo Vendrame at 2025-12-16T09:10:56+01:00 Bug 41669: Restore UglifyJS but for Android x86_64. In 15.0 we use UglifyJS for Android x86. We dropped it in the 16.0 series, as we do not support Android x86, but with this commit we temporarily restore it for x86_64 to fit in the Play Store requirements. With Firefox 148 we might be able to use the same minifier Mozilla uses, since they recently switched to a different one. - - - - - c1a2d204 by Pier Angelo Vendrame at 2025-12-16T10:44:28+01:00 Bug 41513: Prepare Tor Browser 16.0a1 (build3). Build Android again to make sure we do not exceed the Play Store's threshold for APK size with the x86_64 APK. - - - - - 6 changed files: - projects/browser/build.android - projects/browser/config - + projects/uglifyjs/README.md - + projects/uglifyjs/build - + projects/uglifyjs/config - rbm.conf Changes: ===================================== projects/browser/build.android ===================================== @@ -2,6 +2,12 @@ [% c("var/set_default_env") -%] [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] +[% IF c("var/android-x86_64") -%] + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/node') %] + export PATH=/var/tmp/dist/node/bin:$PATH + tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/uglifyjs') %] +[% END -%] + # Bundle our extension(s). # # NoScript will be copied over to the profile folder @@ -58,6 +64,11 @@ function generate_apk { [% IF c("var/tor-browser") -%] cp -a ../moat_countries.json ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/ [% END -%] + [% IF c("var/android-x86_64") -%] + find actors chrome modules moz-src \ + -name '*.js' -or -name '*.mjs' \ + -exec /var/tmp/dist/uglifyjs/bin/uglifyjs --in-situ {} \; + [% END -%] [% c('zip', { zip_src => [ '.' ], zip_args => '-0 ../assets/omni.ja', ===================================== projects/browser/config ===================================== @@ -158,3 +158,9 @@ input_files: # tor-browser-build#40920 - filename: sort-baseline.py enable: '[% c("var/android") %]' + - project: node + name: node + enable: '[% c("var/android-x86_64") %]' + - project: uglifyjs + name: uglifyjs + enable: '[% c("var/android-x86_64") %]' ===================================== projects/uglifyjs/README.md ===================================== @@ -0,0 +1 @@ +This project fetches UglifyJS without any other changes. ===================================== projects/uglifyjs/build ===================================== @@ -0,0 +1,4 @@ +#!/bin/bash +tar -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] +mv [% project %]-[% c('version') %] [% project %] +tar -caf [% dest_dir %]/[% c("filename") %] [% project %] ===================================== projects/uglifyjs/config ===================================== @@ -0,0 +1,4 @@ +version: 3.19.3 +filename: 'uglifyjs-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' +git_hash: 3ea33afc72462a470466473208a33379b7204765 +git_url: https://github.com/mishoo/UglifyJS.git ===================================== rbm.conf ===================================== @@ -82,7 +82,7 @@ buildconf: var: torbrowser_version: '16.0a1' - torbrowser_build: 'build2' + torbrowser_build: 'build3' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. browser_release_date: '2025/12/11 14:20:12' View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/d... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/d... You're receiving this email because of your account on gitlab.torproject.org.
participants (1)
-
Pier Angelo Vendrame (@pierov)