From cbe128fc883c853cf06c1f105d479be7f5d470ae Mon Sep 17 00:00:00 2001 From: Byron Campen Date: Fri, 27 Oct 2023 15:31:38 -0500 Subject: [PATCH] Bug 1860685 - Vendor libwebrtc from 047f656993 Upstream commit: https://webrtc.googlesource.com/src/+/047f65699369cf1c47a18393842cc96d240a7089 Roll chromium_revision e9f81a7ec9..28429d43ee (1190277:1190580) Change log: https://chromium.googlesource.com/chromium/src/+log/e9f81a7ec9..28429d43ee Full diff: https://chromium.googlesource.com/chromium/src/+/e9f81a7ec9..28429d43ee Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/0836b98f17..acfba9339c * src/build: https://chromium.googlesource.com/chromium/src/build/+log/ef1e241143..334b8dfc9c * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/eb7e37edf9..cfab145357 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/45e1922e9c..5b3c37f8da * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/093ca359d9..c11a2151af * src/third_party/androidx: d3SZeP-0r67zTi3JXOzM68IUhwn1ub7W3a7J1ZHqSjIC..nPnktPVZnrvtO_GCDttGFN5jJfRhVxruWs81oS-DSZgC * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/47ca282426..b8c4f2d99a * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/abf4847b04..427f0f43ad * src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/de4ce0071e..985b9a6f70 * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/e8f8016ad8..3a2627c87c * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/1b9e3248e1..e62138ed7e DEPS diff: https://chromium.googlesource.com/chromium/src/+/e9f81a7ec9..28429d43ee/DEPS No update to Clang. BUG=None Change-Id: Ib0fca5e339fb227e39224c99c34c1151612e102b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/318383 Commit-Queue: Autoroller Bot-Commit: Autoroller Cr-Commit-Position: refs/heads/main@{#40669} --- third_party/libwebrtc/DEPS | 24 +++++++++++----------- third_party/libwebrtc/README.moz-ff-commit | 3 +++ third_party/libwebrtc/README.mozilla | 2 ++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/third_party/libwebrtc/DEPS b/third_party/libwebrtc/DEPS index 1cba8357a6d8..5048dbb827cc 100644 --- a/third_party/libwebrtc/DEPS +++ b/third_party/libwebrtc/DEPS @@ -10,7 +10,7 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': 'e9f81a7ec99541b43635bddf4f5b95bb0ef85d5e', + 'chromium_revision': '28429d43ee670d0f4a01e64cea3a32ccaa218f32', # Fetch the prebuilt binaries for llvm-cov and llvm-profdata. Needed to # process the raw profiles produced by instrumented targets (built with @@ -50,9 +50,9 @@ vars = { deps = { # TODO(kjellander): Move this to be Android-only. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@0836b98f17e62534766cb1c6d1f149ccffb520c0', + 'https://chromium.googlesource.com/chromium/src/base@acfba9339c4ee571126fdfcd59d3d15930d61c61', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@ef1e2411434b4fb8684ac8f5b480dd0d66ecdeed', + 'https://chromium.googlesource.com/chromium/src/build@334b8dfc9cfdce1e54f25bee19c5670b462ab164', 'src/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools@b2043d4f435131d0a1bdd5342c17753ef9236572', # Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC. @@ -61,13 +61,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@eb7e37edf9f0f96c2ea4b15a0186ac0750c16af8', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@cfab1453572c3469f193f88a1bea5a736ac8fbb1', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@45e1922e9caa0320c724d0c014ce9d3584d50aad', + 'https://chromium.googlesource.com/chromium/src/testing@5b3c37f8da4cfa8001b6bd94c684f5586ba6a6b4', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@093ca359d9c2b519db9c30e4a969e9266b8e45bc', + 'https://chromium.googlesource.com/chromium/src/third_party@c11a2151afc37abd3ee6b7a5e92e4f89f14b3f9a', 'src/buildtools/linux64': { 'packages': [ @@ -178,7 +178,7 @@ deps = { 'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@8988364bcddd9b194b0bf931c10bc125987330ed', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@47ca2824260532b624f9b3c6afa4d538870ecc47', + 'https://chromium.googlesource.com/catapult.git@b8c4f2d99ac66fe47cb8cceec0dd1a1da5d1b51e', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, @@ -191,7 +191,7 @@ deps = { 'src/third_party/crc32c/src': 'https://chromium.googlesource.com/external/github.com/google/crc32c.git@fa5ade41ee480003d9c5af6f43567ba22e4e17e6', 'src/third_party/depot_tools': - 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@abf4847b0412cac3617c231af35f998eb9141748', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@427f0f43ad0ceb08399561ab9cc60e45931059d3', 'src/third_party/ffmpeg': 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@0ba37733400593b162e5ae9ff26b384cff49c250', 'src/third_party/flatbuffers/src': @@ -227,7 +227,7 @@ deps = { 'src/third_party/googletest/src': 'https://chromium.googlesource.com/external/github.com/google/googletest.git@af29db7ec28d6df1c7f0f745186884091e602e07', 'src/third_party/icu': { - 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@de4ce0071eb47ed54cbda54869001210cf3a8ae5', + 'url': 'https://chromium.googlesource.com/chromium/deps/icu.git@985b9a6f70e13f3db741fed121e4dcc3046ad494', }, 'src/third_party/jdk': { 'packages': [ @@ -295,7 +295,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@e8f8016ad8372810e7872b85589d87ff3eae6f63', + 'https://android.googlesource.com/platform/external/perfetto.git@3a2627c87c9ac8ba338e953f54d8db032d2b9cac', 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@24c0dcc8513b8c1ba4ffbf934a399f89de646ffe', 'src/third_party/libyuv': @@ -344,7 +344,7 @@ deps = { 'condition': 'checkout_android', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@1b9e3248e14b710c63fd9f0baf1cd96517fbe7b1', + 'https://chromium.googlesource.com/chromium/src/tools@e62138ed7ecaf8f53b3e84ed40b176649ec75187', 'src/third_party/accessibility_test_framework': { 'packages': [ @@ -416,7 +416,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'd3SZeP-0r67zTi3JXOzM68IUhwn1ub7W3a7J1ZHqSjIC', + 'version': 'nPnktPVZnrvtO_GCDttGFN5jJfRhVxruWs81oS-DSZgC', }, ], 'condition': 'checkout_android', diff --git a/third_party/libwebrtc/README.moz-ff-commit b/third_party/libwebrtc/README.moz-ff-commit index c9c2120a7611..c8b00dc0d031 100644 --- a/third_party/libwebrtc/README.moz-ff-commit +++ b/third_party/libwebrtc/README.moz-ff-commit @@ -25713,3 +25713,6 @@ df3683e9a7 # MOZ_LIBWEBRTC_SRC=/home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh # base of lastest vendoring 9a9b462e16 +# MOZ_LIBWEBRTC_SRC=/home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh +# base of lastest vendoring +047f656993 diff --git a/third_party/libwebrtc/README.mozilla b/third_party/libwebrtc/README.mozilla index 99d567e52985..73ac0929b788 100644 --- a/third_party/libwebrtc/README.mozilla +++ b/third_party/libwebrtc/README.mozilla @@ -17166,3 +17166,5 @@ libwebrtc updated from /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebr libwebrtc updated from /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-10-27T20:29:33.300292. # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc libwebrtc updated from /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-10-27T20:30:30.614801. +# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc +libwebrtc updated from /home/bcampen/checkouts/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-10-27T20:31:28.261369.