Verified Commit e7648fda authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 41573: Remove UglifyJS. 

For Android x86, we switched to UglifyJS as the minifier used by
Firefox produced invalid files, but minifying was essential to fit in
the limit of the Play Store.

Now that we are abandoning support for Android x86, we can remove
UglifyJS as well.
parent 75e9ffda

projects/browser/build.android

+0 −11
Original line number Diff line number Diff line
@@ -2,12 +2,6 @@ 
[% 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") -%]

  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
@@ -64,11 +58,6 @@ 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") -%]

    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

+0 −6
Original line number Diff line number Diff line
@@ -158,9 +158,3 @@ input_files: 
    # tor-browser-build#40920

  - filename: sort-baseline.py

    enable: '[% c("var/android") %]'
 
  - project: node

    name: node

    enable: '[% c("var/android-x86") %]'

  - project: uglifyjs

    name: uglifyjs

    enable: '[% c("var/android-x86") %]'

projects/uglifyjs/README.md

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
This project fetches UglifyJS without any other changes.

projects/uglifyjs/build

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
#!/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

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
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