Bug 1722341 - Include gfx blocklist in Android dumps. r=Gijs,jnicol,calu

Differential Revision: https://phabricator.services.mozilla.com/D149572

mobile/android/installer/package-manifest.in

@@ -88,10 +88,11 @@
 @BINPATH@/application.ini
 @BINPATH@/platform.ini
 @BINPATH@/defaults/settings/last_modified.json
-@BINPATH@/defaults/settings/blocklists/addons.json
 ; TODO bug 1639050: addons-bloomfilters should be used instead of addons.json
-@BINPATH@/defaults/settings/security-state/onecrl.json
+@BINPATH@/defaults/settings/blocklists/addons.json
+@BINPATH@/defaults/settings/blocklists/gfx.json
 @BINPATH@/defaults/settings/main/password-recipes.json
+@BINPATH@/defaults/settings/security-state/onecrl.json
 
 ; [Components]
 @BINPATH@/components/components.manifest

services/settings/dumps/blocklists/moz.build

@@ -9,8 +9,8 @@ with Files("**"):
 
 # The addons blocklist is also in mobile/android/installer/package-manifest.in
 if CONFIG["MOZ_WIDGET_TOOLKIT"] == "android":
-    # Remove this once bug 1639050 is resolved.
-    FINAL_TARGET_FILES.defaults.settings.blocklists += ["addons.json"]
+    # Remove "addons.json" once bug 1639050 is resolved.
+    FINAL_TARGET_FILES.defaults.settings.blocklists += ["addons.json", "gfx.json"]
 else:
     FINAL_TARGET_FILES.defaults.settings.blocklists += [
         "addons-bloomfilters.json",

toolkit/mozapps/extensions/test/xpcshell/rs-blocklist/test_blocklist_clients.js

@@ -44,7 +44,7 @@ add_task(async function setup() {
     },
     {
       client: BlocklistPrivate.GfxBlocklistRS._client,
-      expectHasDump: !IS_ANDROID,
+      expectHasDump: true,
     },
   ];