Bug 1875960 - Use the build system rather than package-manifest.in, to govern which remote settings dumps are packaged. r=leplatrem,firefox-build-system-reviewers,geckoview-reviewers,glandium,m_kato

Differential Revision: https://phabricator.services.mozilla.com/D206495
2024-04-09 08:18:20 +00:00 · 2024-04-09 08:18:20 +00:00 · d1e65e8eb3
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@ -249,10 +249,7 @@
@RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/permissions
 ; Remote Settings JSON dumps
-@RESPATH@/browser/defaults/settings/last_modified.json
-@RESPATH@/browser/defaults/settings/blocklists
-@RESPATH@/browser/defaults/settings/main
-@RESPATH@/browser/defaults/settings/security-state
+@RESPATH@/browser/defaults/settings

 # channel-prefs.js has been removed on macOS.
 #ifndef XP_MACOSX
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@ -86,15 +86,7 @@
 ; [Base Browser Files]
@BINPATH@/application.ini
@BINPATH@/platform.ini
-@BINPATH@/defaults/settings/last_modified.json
-; The addons blocklist data is not packaged and will be downloaded after install.
-; See https://bugzilla.mozilla.org/show_bug.cgi?id=1639050#c5
-; @BINPATH@/defaults/settings/blocklists/addons-bloomfilters.json
-; @BINPATH@/defaults/settings/blocklists/addons-bloomfilters/addons-mlbf.bin
-; @BINPATH@/defaults/settings/blocklists/addons-bloomfilters/addons-mlbf.bin.meta.json
-@BINPATH@/defaults/settings/blocklists/gfx.json
-@BINPATH@/defaults/settings/main/password-recipes.json
-@BINPATH@/defaults/settings/security-state/onecrl.json
+@BINPATH@/defaults/settings

 ; [Components]
@BINPATH@/components/components.manifest
--- a/mobile/ios/installer/allowed-dupes.mn
+++ b/mobile/ios/installer/allowed-dupes.mn
@ -16,11 +16,5 @@ res/table-remove-row.gif
 res/multilocale.txt
 update.locale

-# Bug 1833829 - Rolling out new search configuration.
-defaults/settings/main/search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11
-defaults/settings/main/search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136
-defaults/settings/main/search-config-icons/6a83583a-f0ba-fd39-2fdb-fd2b6990ea3b
-defaults/settings/main/search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636
-
 components/httpd.sys.mjs
 chrome/remote/content/server/httpd.sys.mjs
--- a/services/settings/docs/index.rst
+++ b/services/settings/docs/index.rst
@ -183,8 +183,11 @@ The JSON dump will serve as the default dataset for ``.get()``, instead of doing
      CID="your-collection"
      curl "https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/${CID}/changeset?_expected=0" | jq '{"data": .changes, "timestamp": .timestamp}' > services/settings/dumps/main/${CID}.json``

-#. Add the filename to the ``FINAL_TARGET_FILES`` list in ``services/settings/dumps/main/moz.build``
-#. Add the filename to the ``[browser]`` section of ``mobile/android/installer/package-manifest.in`` IF the file should be bundled with Android.
+#. Add the filename to the relevant ``FINAL_TARGET_FILES`` list in ``services/settings/dumps/main/moz.build``
+
+  * Please consider the application(s) where the collection is used and only include the dump file in the relevant builds.
+  * If it is only for Firefox desktop, i.e. ``browser/``, then add it to a build-specific browser section.
+  * If it is for all applications, i.e. outside of ``browser/`` are other specific area, then add it to the global section.

 Now, when ``RemoteSettings("some-key").get()`` is called from an empty profile, the ``some-key.json`` file is going to be loaded before the results are returned.

--- a/services/settings/dumps/blocklists/moz.build
+++ b/services/settings/dumps/blocklists/moz.build
@ -7,18 +7,22 @@
 with Files("**"):
    BUG_COMPONENT = ("Toolkit", "Blocklist Implementation")

-# The addons blocklist is also in mobile/android/installer/package-manifest.in
+# These collections are referenced in toolkit/ or other core code.
 FINAL_TARGET_FILES.defaults.settings.blocklists += [
-    "addons-bloomfilters.json",
    "gfx.json",
 ]
-if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
-    FINAL_TARGET_FILES.defaults.settings.blocklists += ["plugins.json"]

-FINAL_TARGET_FILES.defaults.settings.blocklists["addons-bloomfilters"] += [
-    "addons-bloomfilters/addons-mlbf.bin",
-    "addons-bloomfilters/addons-mlbf.bin.meta.json",
-]
+# The addons blocklist data is not packaged on Android/iOS and will be downloaded
+# after install.
+# See https://bugzilla.mozilla.org/show_bug.cgi?id=1639050#c5

-if CONFIG["MOZ_BUILD_APP"] == "browser":
-    DIST_SUBDIR = "browser"
+if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"):
+    FINAL_TARGET_FILES.defaults.settings.blocklists += [
+        "addons-bloomfilters.json",
+        "plugins.json"
+    ]
+
+    FINAL_TARGET_FILES.defaults.settings.blocklists["addons-bloomfilters"] += [
+        "addons-bloomfilters/addons-mlbf.bin",
+        "addons-bloomfilters/addons-mlbf.bin.meta.json",
+    ]
--- a/services/settings/dumps/main/moz.build
+++ b/services/settings/dumps/main/moz.build
@ -2,120 +2,131 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-FINAL_TARGET_FILES.defaults.settings.main += [
-    "anti-tracking-url-decoration.json",
-    "cookie-banner-rules-list.json",
-    "devtools-compatibility-browsers.json",
-    "devtools-devices.json",
-    "example.json",
-    "hijack-blocklists.json",
-    "language-dictionaries.json",
-    "password-recipes.json",
-    "password-rules.json",
-    "search-config-icons.json",
-    "search-config-overrides-v2.json",
-    "search-config-overrides.json",
-    "search-config-v2.json",
-    "search-config.json",
-    "search-default-override-allowlist.json",
-    "search-telemetry-v2.json",
-    "sites-classification.json",
-    "top-sites.json",
-    "translations-identification-models.json",
-    "translations-models.json",
-    "translations-wasm.json",
-    "url-classifier-skip-urls.json",
-    "websites-with-shared-credential-backends.json",
-]
-
-FINAL_TARGET_FILES.defaults.settings.main["search-config-icons"] += [
-    "search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256",
-    "search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256.meta.json",
-    "search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea",
-    "search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea.meta.json",
-    "search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937",
-    "search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937.meta.json",
-    "search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2",
-    "search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2.meta.json",
-    "search-config-icons/101ce01d-2691-b729-7f16-9d389803384b",
-    "search-config-icons/101ce01d-2691-b729-7f16-9d389803384b.meta.json",
-    "search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f",
-    "search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f.meta.json",
-    "search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c",
-    "search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c.meta.json",
-    "search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335",
-    "search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335.meta.json",
-    "search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca",
-    "search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca.meta.json",
-    "search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f",
-    "search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f.meta.json",
-    "search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11",
-    "search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11.meta.json",
-    "search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171",
-    "search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171.meta.json",
-    "search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2",
-    "search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2.meta.json",
-    "search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d",
-    "search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d.meta.json",
-    "search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41",
-    "search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41.meta.json",
-    "search-config-icons/6a83583a-f0ba-fd39-2fdb-fd2b6990ea3b",
-    "search-config-icons/6a83583a-f0ba-fd39-2fdb-fd2b6990ea3b.meta.json",
-    "search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66",
-    "search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66.meta.json",
-    "search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27",
-    "search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27.meta.json",
-    "search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173",
-    "search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173.meta.json",
-    "search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c",
-    "search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c.meta.json",
-    "search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e",
-    "search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e.meta.json",
-    "search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451",
-    "search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451.meta.json",
-    "search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361",
-    "search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361.meta.json",
-    "search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36",
-    "search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36.meta.json",
-    "search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e",
-    "search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e.meta.json",
-    "search-config-icons/890de5c4-0941-a116-473a-5d240e79497a",
-    "search-config-icons/890de5c4-0941-a116-473a-5d240e79497a.meta.json",
-    "search-config-icons/91a9672d-e945-8e1e-0996-aefdb0190716",
-    "search-config-icons/91a9672d-e945-8e1e-0996-aefdb0190716.meta.json",
-    "search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b",
-    "search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b.meta.json",
-    "search-config-icons/a06db97d-1210-ea2e-5474-0e2f7d295bfd",
-    "search-config-icons/a06db97d-1210-ea2e-5474-0e2f7d295bfd.meta.json",
-    "search-config-icons/a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3",
-    "search-config-icons/a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3.meta.json",
-    "search-config-icons/a2c7d4e9-f770-51e1-0963-3c2c8401631d",
-    "search-config-icons/a2c7d4e9-f770-51e1-0963-3c2c8401631d.meta.json",
-    "search-config-icons/b64f09fd-52d1-c48e-af23-4ce918e7bf3b",
-    "search-config-icons/b64f09fd-52d1-c48e-af23-4ce918e7bf3b.meta.json",
-    "search-config-icons/b8ca5a94-8fff-27ad-6e00-96e244a32e21",
-    "search-config-icons/b8ca5a94-8fff-27ad-6e00-96e244a32e21.meta.json",
-    "search-config-icons/c411adc1-9661-4fb5-a4c1-8cfe74911943",
-    "search-config-icons/c411adc1-9661-4fb5-a4c1-8cfe74911943.meta.json",
-    "search-config-icons/cbf9e891-d079-2b28-5617-283450d463dd",
-    "search-config-icons/cbf9e891-d079-2b28-5617-283450d463dd.meta.json",
-    "search-config-icons/d87f251c-3e12-a8bf-e2d0-afd43d36c5f9",
-    "search-config-icons/d87f251c-3e12-a8bf-e2d0-afd43d36c5f9.meta.json",
-    "search-config-icons/e02f23df-8d48-2b1b-3b5c-6dd27302c61c",
-    "search-config-icons/e02f23df-8d48-2b1b-3b5c-6dd27302c61c.meta.json",
-    "search-config-icons/e718e983-09aa-e8f6-b25f-cd4b395d4785",
-    "search-config-icons/e718e983-09aa-e8f6-b25f-cd4b395d4785.meta.json",
-    "search-config-icons/e7547f62-187b-b641-d462-e54a3f813d9a",
-    "search-config-icons/e7547f62-187b-b641-d462-e54a3f813d9a.meta.json",
-    "search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636",
-    "search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636.meta.json",
-    "search-config-icons/fa0fc42c-d91d-fca7-34eb-806ff46062dc",
-    "search-config-icons/fa0fc42c-d91d-fca7-34eb-806ff46062dc.meta.json",
-    "search-config-icons/fca3e3ee-56cd-f474-dc31-307fd24a891d",
-    "search-config-icons/fca3e3ee-56cd-f474-dc31-307fd24a891d.meta.json",
-    "search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136",
-    "search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136.meta.json",
-]
-
 if CONFIG["MOZ_BUILD_APP"] == "browser":
-    DIST_SUBDIR = "browser"
+    # These collections are only referenced from browser/
+    FINAL_TARGET_FILES.defaults.settings.main += [
+        "language-dictionaries.json",
+        "search-telemetry-v2.json",
+        "sites-classification.json",
+        "top-sites.json",
+   ]
+
+# These collections are referenced in toolkit/ or other core code, however
+# Android/iOS don't use/want the dumps.
+if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"):
+    FINAL_TARGET_FILES.defaults.settings.main += [
+        "anti-tracking-url-decoration.json",
+        "cookie-banner-rules-list.json",
+        "devtools-compatibility-browsers.json",
+        "devtools-devices.json",
+        "example.json",
+        "hijack-blocklists.json",
+        "password-rules.json",
+        "search-config-icons.json",
+        "search-config-overrides-v2.json",
+        "search-config-overrides.json",
+        "search-config-v2.json",
+        "search-config.json",
+        "search-default-override-allowlist.json",
+        "translations-identification-models.json",
+        "translations-models.json",
+        "translations-wasm.json",
+        "url-classifier-skip-urls.json",
+        "websites-with-shared-credential-backends.json",
+    ]
+
+# These collections are referenced in toolkit/ or other core code.
+FINAL_TARGET_FILES.defaults.settings.main += [
+    "password-recipes.json",
+]
+
+# These search config icons only apply to desktop.
+if CONFIG["MOZ_BUILD_APP"] == "browser":
+    FINAL_TARGET_FILES.defaults.settings.main["search-config-icons"] += [
+        "search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256",
+        "search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256.meta.json",
+        "search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea",
+        "search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea.meta.json",
+        "search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937",
+        "search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937.meta.json",
+        "search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2",
+        "search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2.meta.json",
+        "search-config-icons/101ce01d-2691-b729-7f16-9d389803384b",
+        "search-config-icons/101ce01d-2691-b729-7f16-9d389803384b.meta.json",
+        "search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f",
+        "search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f.meta.json",
+        "search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c",
+        "search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c.meta.json",
+        "search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335",
+        "search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335.meta.json",
+        "search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca",
+        "search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca.meta.json",
+        "search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f",
+        "search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f.meta.json",
+        "search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11",
+        "search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11.meta.json",
+        "search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171",
+        "search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171.meta.json",
+        "search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2",
+        "search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2.meta.json",
+        "search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d",
+        "search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d.meta.json",
+        "search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41",
+        "search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41.meta.json",
+        "search-config-icons/6a83583a-f0ba-fd39-2fdb-fd2b6990ea3b",
+        "search-config-icons/6a83583a-f0ba-fd39-2fdb-fd2b6990ea3b.meta.json",
+        "search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66",
+        "search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66.meta.json",
+        "search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27",
+        "search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27.meta.json",
+        "search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173",
+        "search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173.meta.json",
+        "search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c",
+        "search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c.meta.json",
+        "search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e",
+        "search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e.meta.json",
+        "search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451",
+        "search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451.meta.json",
+        "search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361",
+        "search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361.meta.json",
+        "search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36",
+        "search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36.meta.json",
+        "search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e",
+        "search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e.meta.json",
+        "search-config-icons/890de5c4-0941-a116-473a-5d240e79497a",
+        "search-config-icons/890de5c4-0941-a116-473a-5d240e79497a.meta.json",
+        "search-config-icons/91a9672d-e945-8e1e-0996-aefdb0190716",
+        "search-config-icons/91a9672d-e945-8e1e-0996-aefdb0190716.meta.json",
+        "search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b",
+        "search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b.meta.json",
+        "search-config-icons/a06db97d-1210-ea2e-5474-0e2f7d295bfd",
+        "search-config-icons/a06db97d-1210-ea2e-5474-0e2f7d295bfd.meta.json",
+        "search-config-icons/a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3",
+        "search-config-icons/a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3.meta.json",
+        "search-config-icons/a2c7d4e9-f770-51e1-0963-3c2c8401631d",
+        "search-config-icons/a2c7d4e9-f770-51e1-0963-3c2c8401631d.meta.json",
+        "search-config-icons/b64f09fd-52d1-c48e-af23-4ce918e7bf3b",
+        "search-config-icons/b64f09fd-52d1-c48e-af23-4ce918e7bf3b.meta.json",
+        "search-config-icons/b8ca5a94-8fff-27ad-6e00-96e244a32e21",
+        "search-config-icons/b8ca5a94-8fff-27ad-6e00-96e244a32e21.meta.json",
+        "search-config-icons/c411adc1-9661-4fb5-a4c1-8cfe74911943",
+        "search-config-icons/c411adc1-9661-4fb5-a4c1-8cfe74911943.meta.json",
+        "search-config-icons/cbf9e891-d079-2b28-5617-283450d463dd",
+        "search-config-icons/cbf9e891-d079-2b28-5617-283450d463dd.meta.json",
+        "search-config-icons/d87f251c-3e12-a8bf-e2d0-afd43d36c5f9",
+        "search-config-icons/d87f251c-3e12-a8bf-e2d0-afd43d36c5f9.meta.json",
+        "search-config-icons/e02f23df-8d48-2b1b-3b5c-6dd27302c61c",
+        "search-config-icons/e02f23df-8d48-2b1b-3b5c-6dd27302c61c.meta.json",
+        "search-config-icons/e718e983-09aa-e8f6-b25f-cd4b395d4785",
+        "search-config-icons/e718e983-09aa-e8f6-b25f-cd4b395d4785.meta.json",
+        "search-config-icons/e7547f62-187b-b641-d462-e54a3f813d9a",
+        "search-config-icons/e7547f62-187b-b641-d462-e54a3f813d9a.meta.json",
+        "search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636",
+        "search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636.meta.json",
+        "search-config-icons/fa0fc42c-d91d-fca7-34eb-806ff46062dc",
+        "search-config-icons/fa0fc42c-d91d-fca7-34eb-806ff46062dc.meta.json",
+        "search-config-icons/fca3e3ee-56cd-f474-dc31-307fd24a891d",
+        "search-config-icons/fca3e3ee-56cd-f474-dc31-307fd24a891d.meta.json",
+        "search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136",
+        "search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136.meta.json",
+    ]
--- a/services/settings/dumps/moz.build
+++ b/services/settings/dumps/moz.build
@ -14,3 +14,4 @@ FINAL_TARGET_FILES.defaults.settings += ["!%s" % dump_summary]

 if CONFIG["MOZ_BUILD_APP"] == "browser":
    DIST_SUBDIR = "browser"
+    export("DIST_SUBDIR")
--- a/services/settings/dumps/security-state/moz.build
+++ b/services/settings/dumps/security-state/moz.build
@ -2,10 +2,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

+# These collections are referenced in toolkit/ or other core code.
 FINAL_TARGET_FILES.defaults.settings["security-state"] += [
-    "intermediates.json",
    "onecrl.json",
 ]

-if CONFIG["MOZ_BUILD_APP"] == "browser":
-    DIST_SUBDIR = "browser"
+# Not packaged on android/ios currently - not crucial data for first load.
+if not CONFIG["MOZ_BUILD_APP"].startswith("mobile/"):
+    FINAL_TARGET_FILES.defaults.settings["security-state"] += [
+        "intermediates.json",
+    ]
--- a/services/settings/static-dumps/main/moz.build
+++ b/services/settings/static-dumps/main/moz.build
@ -2,10 +2,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-FINAL_TARGET_FILES.defaults.settings.main += [
-    "doh-config.json",
-    "doh-providers.json",
-]
-
 if CONFIG["MOZ_BUILD_APP"] == "browser":
    DIST_SUBDIR = "browser"
+
+    # These collections are only referenced from browser/
+    FINAL_TARGET_FILES.defaults.settings.main += [
+        "doh-config.json",
+        "doh-providers.json",
+    ]