commit 7f647b0fc5312b64e5b78291691bb0f6c156dc5d Author: Alex Catarineu <acat@torproject.org> Date: Wed Sep 16 19:52:45 2020 +0200 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances addons.json is not used anymore with v3 blocklisting enabled, so we don't add it while we are at it. Closes tor-browser#40128. --- services/settings/dumps/blocklists/moz.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/settings/dumps/blocklists/moz.build b/services/settings/dumps/blocklists/moz.build index 3ba9ba4980a8..dd0bad30f19a 100644 --- a/services/settings/dumps/blocklists/moz.build +++ b/services/settings/dumps/blocklists/moz.build @@ -8,9 +8,14 @@ with Files('**'): BUG_COMPONENT = ('Toolkit', 'Blocklist Implementation') # The addons blocklist is also in mobile/android/installer/package-manifest.in -FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons.json', +FINAL_TARGET_FILES.defaults.settings.blocklists += ['addons-bloomfilters.json', 'gfx.json', 'plugins.json'] +FINAL_TARGET_FILES.defaults.settings.blocklists['addons-bloomfilters'] += [ + 'addons-bloomfilters/addons-mlbf.bin', + 'addons-bloomfilters/addons-mlbf.bin.meta.json' +] + if CONFIG['MOZ_BUILD_APP'] == 'browser': DIST_SUBDIR = 'browser'