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

Bug 41200: Remove the tools for allowed_addons.json. 

For tor-browser#42618 and tor-browser#42619, we stopped using the
allowed_addons.json, but initially we kept the tools to update it.
However, the file creates some confusion, because it is used only for
Andorid, but should be updated also when doing desktop-only releases
when they update NoScript, or Android nightly builds might fail.
So, since as a matter of fact we do not use that file anymore, we
decided to stop updating it and remove the related tools.
parent 72f49dc1

.gitattributes

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
projects/browser/allowed_addons.json -diff

.gitlab/issue_templates/Release Prep - Tor Browser Alpha.md

+0 −2
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ Tor Browser Alpha (and Nightly) are on the `main` branch 
    - [ ] `fenix_version` : update to match alpha `firefox-android` build tag

    - [ ] `browser_branch` : update to match alpha `firefox-android` build tag

    - [ ] `browser_build` : update to match alpha `firefox-android` build tag

  - [ ] Update allowed_addons.json by running (from `tor-browser-build` root):

    - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json`

- [ ] Update `projects/translation/config`:

  - [ ] run `make list_translation_updates-alpha` to get updated hashes

  - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch

.gitlab/issue_templates/Release Prep - Tor Browser Stable.md

+0 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE 
    - [ ] `browser_branch` : update to match stable `firefox-android` build tag

    - [ ] `browser_build` : update to match stable `firefox-android` build tag

  variant: Beta

  - [ ] Update allowed_addons.json by running (from `tor-browser-build` root):

    - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json`

- [ ] Update `projects/translation/config`:

  - [ ] run `make list_translation_updates-release` to get updated hashes

  - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch

projects/browser/allowed_addons.json

deleted100644 → 0
+0 −2868

File deleted.

Preview size limit exceeded, changes collapsed.

projects/browser/build.android

+0 −9
Original line number Diff line number Diff line
@@ -39,15 +39,6 @@ unzip ../omni.ja 
      }) %]

popd





[% IF c("var/verify_allowed_addons") %]

  # Check that allowed_addons.json contains the right versions of our bundled extension(s).

  # If so, replace the default allowed_addons.json by ours in the apk assets folder.

  $rootdir/verify_allowed_addons.py "$rootdir/allowed_addons.json" "$noscript_path"

[% END %]



mv $rootdir/allowed_addons.json $assets_dir/allowed_addons.json



mkdir apk

pushd apk

7zz x "$apk"