commit bf43c6823ec7d88175f6a0e7cb0323b39cf49ad6 Author: Alex Catarineu acat@torproject.org Date: Fri Dec 4 15:45:44 2020 +0100

fixup! Bug 40128: Allow updating Fenix allowed_addons.json --- projects/tor-browser/build.android | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/tor-browser/build.android b/projects/tor-browser/build.android index 3e76614..71b9d36 100644 --- a/projects/tor-browser/build.android +++ b/projects/tor-browser/build.android @@ -17,9 +17,9 @@ unzip -d $ext_dir/https-everywhere $rootdir/[% c('input_files_by_name/https-ever mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi

[% IF c("var/verify_allowed_addons") %] -# Check that allowed_addons.json contains the right versions of NoScript and HTTPS Everywhere -# If so, replace the default allowed_addons.json by ours in the apk assets folder. -$rootdir/verify_allowed_addons.py "$rootdir/allowed_addons.json" "$ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" "$rootdir/[% c('input_files_by_name/https-everywhere') %]" + # Check that allowed_addons.json contains the right versions of NoScript and HTTPS Everywhere + # If so, replace the default allowed_addons.json by ours in the apk assets folder. + $rootdir/verify_allowed_addons.py "$rootdir/allowed_addons.json" "$ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" "$rootdir/[% c('input_files_by_name/https-everywhere') %]" [% END %]

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