зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1870913 - Add search-config-icons dumps to the build and update system. r=leplatrem
Differential Revision: https://phabricator.services.mozilla.com/D196898
This commit is contained in:
Mark Banner
Родитель
f020c17aa3
Коммит
2664458c02
|
|
@ -103,6 +103,84 @@ browser/chrome/browser/search-extensions/yandex/yandex-en.ico
|
|||
browser/chrome/browser/content/activity-stream/data/content/tippytop/favicons/yandex-ru.png
|
||||
browser/chrome/browser/search-extensions/yandex/yandex-ru.ico
|
||||
|
||||
# Bug 1833829 - Rolling out new search configuration.
|
||||
browser/chrome/browser/search-extensions/1und1/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/d87f251c-3e12-a8bf-e2d0-afd43d36c5f9
|
||||
browser/chrome/browser/search-extensions/longdo/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/32d26d19-aeb0-5c01-32e8-f8970be9246f
|
||||
browser/chrome/browser/search-extensions/ceneji/favicon.png
|
||||
browser/defaults/settings/main/search-config-icons/50f6171f-8e7a-b41b-862e-f97397038fb2
|
||||
browser/chrome/browser/search-extensions/wolnelektury-pl/favicon.png
|
||||
browser/defaults/settings/main/search-config-icons/e718e983-09aa-e8f6-b25f-cd4b395d4785
|
||||
browser/chrome/browser/search-extensions/wiktionary/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/91a9672d-e945-8e1e-0996-aefdb0190716
|
||||
browser/chrome/browser/search-extensions/tyda-sv-SE/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/a2c7d4e9-f770-51e1-0963-3c2c8401631d
|
||||
browser/chrome/browser/search-extensions/bok-NO/favicon.png
|
||||
browser/defaults/settings/main/search-config-icons/890de5c4-0941-a116-473a-5d240e79497a
|
||||
browser/chrome/browser/search-extensions/leo_ende_de/favicon.png
|
||||
browser/defaults/settings/main/search-config-icons/b64f09fd-52d1-c48e-af23-4ce918e7bf3b
|
||||
browser/chrome/browser/search-extensions/priberam/favicon.png
|
||||
browser/defaults/settings/main/search-config-icons/0eec5640-6fde-d6fe-322a-c72c6d5bd5a2
|
||||
browser/chrome/browser/search-extensions/wikipedia/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/101ce01d-2691-b729-7f16-9d389803384b
|
||||
browser/chrome/browser/search-extensions/faclair-beag/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/6d10d702-7bd6-1452-90a5-3df665a38f66
|
||||
browser/chrome/browser/search-extensions/gmx/favicon.png
|
||||
browser/defaults/settings/main/search-config-icons/25de0352-aabb-d31f-15f7-bf9299fb004c
|
||||
browser/defaults/settings/main/search-config-icons/96327a73-c433-5eb4-a16d-b090cadfb80b
|
||||
browser/chrome/browser/search-extensions/gulesider-NO/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/e7547f62-187b-b641-d462-e54a3f813d9a
|
||||
browser/chrome/browser/search-extensions/mailcom/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/87ac4cde-f581-398b-1e32-eb4079183b36
|
||||
browser/chrome/browser/search-extensions/prisjakt-sv-SE/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/177aba42-9bed-4078-e36b-580e8794cd7f
|
||||
browser/defaults/settings/main/search-config-icons/2e835b0e-9709-d1bb-9725-87f59f3445ca
|
||||
browser/defaults/settings/main/search-config-icons/70fdd651-6c50-b7bb-09ec-7e85da259173
|
||||
browser/chrome/browser/search-extensions/seznam-cz/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/84bb4962-e571-227a-9ef6-2ac5f2aac361
|
||||
browser/chrome/browser/search-extensions/eudict/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/c411adc1-9661-4fb5-a4c1-8cfe74911943
|
||||
browser/chrome/browser/search-extensions/mapy-cz/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/b8ca5a94-8fff-27ad-6e00-96e244a32e21
|
||||
browser/chrome/browser/search-extensions/rakuten/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/06cf7432-efd7-f244-927b-5e423005e1ea
|
||||
browser/chrome/browser/search-extensions/readmoo/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/e02f23df-8d48-2b1b-3b5c-6dd27302c61c
|
||||
browser/chrome/browser/search-extensions/pazaruvaj/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/7efbed51-813c-581d-d8d3-f8758434e451
|
||||
browser/chrome/browser/search-extensions/odpiralni/favicon.png
|
||||
browser/defaults/settings/main/search-config-icons/4e271681-3e0f-91ac-9750-03f665efc171
|
||||
browser/chrome/browser/search-extensions/yahoo-jp-auctions/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/a06db97d-1210-ea2e-5474-0e2f7d295bfd
|
||||
browser/defaults/settings/main/search-config-icons/a06dc3fd-4bdb-41f3-2ebc-4cbed06a9bd3
|
||||
browser/chrome/browser/search-extensions/salidzinilv/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/fca3e3ee-56cd-f474-dc31-307fd24a891d
|
||||
browser/chrome/browser/search-extensions/webde/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/6f4da442-d31e-28f8-03af-797d16bbdd27
|
||||
browser/defaults/settings/main/search-config-icons/cbf9e891-d079-2b28-5617-283450d463dd
|
||||
browser/defaults/settings/main/search-config-icons/fa0fc42c-d91d-fca7-34eb-806ff46062dc
|
||||
browser/chrome/browser/search-extensions/azerdict/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/7bbe6c5c-fdb8-2845-a4f4-e1382e708a0e
|
||||
browser/chrome/browser/search-extensions/baidu/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/5ded611d-44b2-dc46-fd67-fb116888d75d
|
||||
browser/chrome/browser/search-extensions/coccoc/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/0d7668a8-c3f4-cfee-cbc8-536511528937
|
||||
browser/chrome/browser/search-extensions/daum-kr/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/8831ce10-b1e4-6eb4-4975-83c67457288e
|
||||
browser/chrome/browser/search-extensions/ecosia/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/001500a9-1a6c-3f5a-ba15-a5f5a075d256
|
||||
browser/defaults/settings/main/search-config-icons/47da97b5-600f-c450-fd15-a52bb2169c11
|
||||
browser/defaults/settings/main/search-config-icons/fed4f021-ff3e-942a-010e-afa43fda2136
|
||||
browser/chrome/browser/search-extensions/naver-kr/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/2bbe48f4-d3b8-c9e0-86e3-a54c37ec3335
|
||||
browser/defaults/settings/main/search-config-icons/6a83583a-f0ba-fd39-2fdb-fd2b6990ea3b
|
||||
browser/defaults/settings/main/search-config-icons/f312610a-ebfb-a106-ea92-fd643c5d3636
|
||||
browser/chrome/browser/search-extensions/vatera/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/5e03d6f4-6ee9-8bc8-cf22-7a5f2cf55c41
|
||||
browser/chrome/browser/search-extensions/yahoo-jp/favicon.ico
|
||||
browser/defaults/settings/main/search-config-icons/74793ce1-a918-a5eb-d3c0-2aadaff3c88c
|
||||
|
||||
# Bug 1720584 - De-duplicate theme and customize icons
|
||||
chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.svg
|
||||
browser/chrome/browser/skin/classic/browser/customize.svg
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ FINAL_TARGET_FILES.defaults.settings.main += [
|
|||
"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",
|
||||
|
|
@ -27,5 +28,94 @@ FINAL_TARGET_FILES.defaults.settings.main += [
|
|||
"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"
|
||||
|
|
|
|||
|
|
@ -332,8 +332,16 @@ function compare_remote_settings_files {
|
|||
update_remote_settings_attachment "${bucket}" "${collection}" addons-mlbf.bin \
|
||||
'map(select(.attachment_type == "bloomfilter-base")) | sort_by(.generation_time) | last'
|
||||
fi
|
||||
# Here is an example to download an attachment with record identifier "ID":
|
||||
# update_remote_settings_attachment "${bucket}" "${collection}" ID '.[] | select(.id == "ID")'
|
||||
# TODO: Bug 1873448. This cannot handle new/removed files currently, due to the
|
||||
# build system making it difficult.
|
||||
if [ "${bucket}" = "main" ] && [ "${collection}" = "search-config-icons" ]; then
|
||||
${JQ} -r '.data[] | .id' < "${local_location_output}" |\
|
||||
while read -r id; do
|
||||
# We do not want quotes around ${id}
|
||||
# shellcheck disable=SC2086
|
||||
update_remote_settings_attachment "${bucket}" "${collection}" ${id} ".[] | select(.id == \"${id}\")"
|
||||
done
|
||||
fi
|
||||
# NOTE: The downloaded data is not validated. xpcshell should be used for that.
|
||||
done
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче