Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

5 changed files:

Changes:

  • projects/browser/build.android
    ... ... @@ -2,6 +2,12 @@
    2 2
     [% c("var/set_default_env") -%]
    
    3 3
     [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
    
    4 4
     
    
    5
    +[% IF c("var/android-x86") -%]
    
    6
    +  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/node') %]
    
    7
    +  export PATH=/var/tmp/dist/node/bin:$PATH
    
    8
    +  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/uglifyjs') %]
    
    9
    +[% END -%]
    
    10
    +
    
    5 11
     # Bundle our extension(s).
    
    6 12
     #
    
    7 13
     # NoScript will be copied over to the profile folder
    
    ... ... @@ -58,6 +64,11 @@ function generate_apk {
    58 64
       [% IF c("var/tor-browser") -%]
    
    59 65
         cp -a ../moat_countries.json ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/
    
    60 66
       [% END -%]
    
    67
    +  [% IF c("var/android-x86") -%]
    
    68
    +    find actors chrome modules moz-src \
    
    69
    +      -name '*.js' -or -name '*.mjs' \
    
    70
    +      -exec /var/tmp/dist/uglifyjs/bin/uglifyjs --in-situ {} \;
    
    71
    +  [% END -%]
    
    61 72
       [% c('zip', {
    
    62 73
             zip_src   => [ '.' ],
    
    63 74
             zip_args  => '-0 ../assets/omni.ja',
    

  • projects/browser/config
    ... ... @@ -163,3 +163,9 @@ input_files:
    163 163
         # tor-browser-build#40920
    
    164 164
       - filename: sort-baseline.py
    
    165 165
         enable: '[% c("var/android") %]'
    
    166
    +  - project: node
    
    167
    +    name: node
    
    168
    +    enable: '[% c("var/android-x86") %]'
    
    169
    +  - project: uglifyjs
    
    170
    +    name: uglifyjs
    
    171
    +    enable: '[% c("var/android-x86") %]'

  • projects/uglifyjs/README.md
    1
    +This project fetches UglifyJS without any other changes.

  • projects/uglifyjs/build
    1
    +#!/bin/bash
    
    2
    +tar -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
    
    3
    +mv [% project %]-[% c('version') %] [% project %]
    
    4
    +tar -caf [% dest_dir %]/[% c("filename") %] [% project %]

  • projects/uglifyjs/config
    1
    +version: 3.19.3
    
    2
    +filename: 'uglifyjs-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    
    3
    +git_hash: 3ea33afc72462a470466473208a33379b7204765
    
    4
    +git_url: https://github.com/mishoo/UglifyJS.git