Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 49 insertions, 2 deletions

diff --git a/tools/rewriting/Generated.txt b/tools/rewriting/Generated.txt
index f8aa8f24c6..c657d1d24d 100644
--- a/tools/rewriting/Generated.txt
+++ b/tools/rewriting/Generated.txt
@@ -23,8 +23,6 @@ dom/tests/ajax/mochikit/
 intl/components/src/UnicodeScriptCodes.h
 intl/unicharutil/util/nsSpecialCasingData.cpp
 intl/unicharutil/util/nsUnicodePropertyData.cpp
-mobile/locales/l10n-changesets.json
-mobile/locales/l10n-onchange-changesets.json
 mobile/android/**/.build-cache
 mobile/android/**/.gradle
 mobile/android/**/build
@@ -32,6 +30,50 @@ mobile/android/**/bin
 mobile/android/**/generated
 mobile/android/**\/local.properties
 mobile/android/**\/manifest.json
+mobile/android/android-components/components/feature/search/src/main/assets/search/search_telemetry_v2.json
+mobile/android/android-components/components/browser/engine-system/src/main/res/
+mobile/android/android-components/components/browser/errorpages/src/main/res/
+mobile/android/android-components/components/browser/menu/src/main/res/
+mobile/android/android-components/components/browser/menu2/src/main/res/
+mobile/android/android-components/components/browser/toolbar/src/main/res/
+mobile/android/android-components/components/browser/toolbar2/src/main/res/
+mobile/android/android-components/components/compose/awesomebar/src/main/res/
+mobile/android/android-components/components/compose/browser-toolbar/src/main/res/
+mobile/android/android-components/components/compose/cfr/src/main/res/
+mobile/android/android-components/components/compose/tabstray/src/main/res/
+mobile/android/android-components/components/feature/addons/src/main/res/
+mobile/android/android-components/components/feature/app-links/src/main/res/
+mobile/android/android-components/components/feature/autofill/src/main/res/
+mobile/android/android-components/components/feature/awesomebar/src/main/res/
+mobile/android/android-components/components/feature/contextmenu/src/main/res/
+mobile/android/android-components/components/feature/customtabs/src/main/res/
+mobile/android/android-components/components/feature/downloads/src/main/res/
+mobile/android/android-components/components/feature/findinpage/src/main/res/
+mobile/android/android-components/components/feature/fxsuggest/src/main/res/
+mobile/android/android-components/components/feature/media/src/main/res/
+mobile/android/android-components/components/feature/privatemode/src/main/res/
+mobile/android/android-components/components/feature/prompts/src/main/res/
+mobile/android/android-components/components/feature/pwa/src/main/res/
+mobile/android/android-components/components/feature/qr/src/main/res/
+mobile/android/android-components/components/feature/readerview/src/main/res/
+mobile/android/android-components/components/feature/search/src/main/res/
+mobile/android/android-components/components/feature/sitepermissions/
+mobile/android/android-components/components/feature/tabs/src/main/res/
+mobile/android/android-components/components/feature/webnotifications/src/main/res/
+mobile/android/android-components/components/lib/crash/src/main/res/
+mobile/android/android-components/components/service/nimbus/src/main/res/
+mobile/android/android-components/components/support/base/src/main/res/
+mobile/android/android-components/components/support/ktx/src/main/res/
+mobile/android/android-components/components/support/utils/src/main/res/
+mobile/android/android-components/components/ui/tabcounter/src/main/res/
+mobile/android/android-components/components/ui/widgets/src/main/res/
+mobile/android/android-components/samples/glean/src/main/res/raw/initial_experiments.json
+mobile/android/fenix/app/src/debug/res/raw/initial_experiments.json
+mobile/android/fenix/app/src/main/res/
+mobile/android/fenix/app/src/main/res/raw/initial_experiments.json
+mobile/android/focus-android/app/src/main/res/
+mobile/locales/l10n-changesets.json
+mobile/locales/l10n-onchange-changesets.json
 node_modules/
 python/mozperftest/mozperftest/tests/data/
 security/manager/tools/KnownRootHashes.json
diff --git a/tools/rewriting/ThirdPartyPaths.txt b/tools/rewriting/ThirdPartyPaths.txt
index 2f07ead2ea..8a0a3b9daa 100644
--- a/tools/rewriting/ThirdPartyPaths.txt
+++ b/tools/rewriting/ThirdPartyPaths.txt
@@ -36,6 +36,7 @@ dom/media/platforms/ffmpeg/ffmpeg57/
 dom/media/platforms/ffmpeg/ffmpeg58/
 dom/media/platforms/ffmpeg/ffmpeg59/
 dom/media/platforms/ffmpeg/ffmpeg60/
+dom/media/platforms/ffmpeg/ffmpeg61/
 dom/media/platforms/ffmpeg/libav53/
 dom/media/platforms/ffmpeg/libav54/
 dom/media/platforms/ffmpeg/libav55/
@@ -134,6 +135,9 @@ media/openmax_il/
 media/webrtc/signaling/gtest/MockCall.h
 mfbt/double-conversion/double-conversion/
 mfbt/lz4/.*
+mobile/android/android-components/components/feature/readerview/src/main/assets/extensions/readerview/readability/JSDOMParser-0.4.2.js
+mobile/android/android-components/components/feature/readerview/src/main/assets/extensions/readerview/readability/readability-0.4.2.js
+mobile/android/android-components/components/feature/readerview/src/main/assets/extensions/readerview/readability/readability-readerable-0.4.2.js
 mobile/android/exoplayer2/
 modules/brotli/
 modules/fdlibm/
@@ -180,6 +184,7 @@ testing/xpcshell/node-ws/
 third_party/
 toolkit/components/certviewer/content/vendor/
 toolkit/components/jsoncpp/
+toolkit/components/ml/vendor/
 toolkit/components/normandy/vendor/
 toolkit/components/passwordmgr/PasswordRulesParser.sys.mjs
 toolkit/components/protobuf/