From 2edf4a2851e9a52060bd87a9dc2bf604eadebd03 Mon Sep 17 00:00:00 2001 From: Michael Froman Date: Wed, 13 Apr 2022 09:38:40 -0500 Subject: [PATCH] Bug 1766646 - Vendor libwebrtc from c05e9a0f89 Upstream commit: https://webrtc.googlesource.com/src/+/c05e9a0f89ed300c967d5b077707717234d598f1 Roll chromium_revision eb498e0972..15eae87dde (815502:815630) Change log: https://chromium.googlesource.com/chromium/src/+log/eb498e0972..15eae87dde Full diff: https://chromium.googlesource.com/chromium/src/+/eb498e0972..15eae87dde Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/56bf79cfe2..e5a46ee795 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/f12b0ac8bf..2f6a131cc7 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/7ac99997b3..c41a4d93e9 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/26fd14f32d..5fccab2fe3 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/beb2078b3a..a69f4e6d34 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/56df381f78..e611beb183 * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/7c2d888fdf..c251d370b6 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/75b865bc9f..548cdef70c DEPS diff: https://chromium.googlesource.com/chromium/src/+/eb498e0972..15eae87dde/DEPS No update to Clang. TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com, BUG=None Change-Id: I5e3a64f9aced3cad25685daca2a2c705b8c924cd Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/187445 Reviewed-by: Autoroller Commit-Queue: Autoroller Cr-Commit-Position: refs/heads/master@{#32371} --- third_party/libwebrtc/DEPS | 18 +++++++++--------- third_party/libwebrtc/README.moz-ff-commit | 3 +++ third_party/libwebrtc/README.mozilla | 2 ++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/third_party/libwebrtc/DEPS b/third_party/libwebrtc/DEPS index 65089c3e5aae..79aad236a91c 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': 'eb498e0972b5401aaf40e98e22c0684631bc594c', + 'chromium_revision': '15eae87dde79dc8530dfbb9bc8f42e2c6c584a80', # This can be overridden, e.g. with custom_vars, to download a nonstandard # Xcode version in build/mac_toolchain.py @@ -22,9 +22,9 @@ deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@56bf79cfe251e5d59545755caf7baa3b96e91c1e', + 'https://chromium.googlesource.com/chromium/src/base@e5a46ee795a42e7f8d885d6acb6888b228877bbe', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@f12b0ac8bffb0b9add545b1e38efdcafedcf0278', + 'https://chromium.googlesource.com/chromium/src/build@2f6a131cc7bdb209fd1654fb5c62f8cdff75f04f', 'src/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools@4be464e050b3d05060471788f926b34c641db9fd', # Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC. @@ -33,13 +33,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@7ac99997b36ad7985a5a78d925776142d769a3f7', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@c41a4d93e9f322b3e664406cab249a10fff9b94b', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@26fd14f32da42a680324f1c9bb136f3101f6c3f0', + 'https://chromium.googlesource.com/chromium/src/testing@5fccab2fe3bbe76a5ddfe00b1ee6e44b3f1e8f59', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@beb2078b3a53a015e83594a3f30eba663926fa88', + 'https://chromium.googlesource.com/chromium/src/third_party@a69f4e6d340f8f6be981f230baafc35fa00c29c4', 'src/buildtools/linux64': { 'packages': [ @@ -130,7 +130,7 @@ deps = { 'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@9c4671f2e3a63c0f155d9b2511192d0b5fa7f760', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@56df381f7893b9cbf6edae333325c5ae8eb01903', + 'https://chromium.googlesource.com/catapult.git@e611beb1834069d510f53a5f436b31e9241b9993', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, @@ -208,7 +208,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@7c2d888fdffc6294563173dc335f2d8d2d680b61', + 'https://android.googlesource.com/platform/external/perfetto.git@c251d370b65ed2b50c02e89c8d8852026c2fda24', 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@7e8ea22e4056a3da04b139fcc812a3f6937bbed7', 'src/third_party/libyuv': @@ -265,7 +265,7 @@ deps = { 'condition': 'checkout_win', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@75b865bc9ffa757de7c43ecef2df59f15a3feb3f', + 'https://chromium.googlesource.com/chromium/src/tools@548cdef70c8f4970aaecf1c35589a4506098e046', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@d46ea7635f2911208268170512cb611412488fd8', diff --git a/third_party/libwebrtc/README.moz-ff-commit b/third_party/libwebrtc/README.moz-ff-commit index 97d73299f323..5f6cb4fd0b63 100644 --- a/third_party/libwebrtc/README.moz-ff-commit +++ b/third_party/libwebrtc/README.moz-ff-commit @@ -651,3 +651,6 @@ c5f7108758 # MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh # base of lastest vendoring cdebea0f48 +# MOZ_LIBWEBRTC_SRC=/home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src MOZ_LIBWEBRTC_COMMIT=mjfdev bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh +# base of lastest vendoring +c05e9a0f89 diff --git a/third_party/libwebrtc/README.mozilla b/third_party/libwebrtc/README.mozilla index 29f1d396a90b..f3007ce6c941 100644 --- a/third_party/libwebrtc/README.mozilla +++ b/third_party/libwebrtc/README.mozilla @@ -436,3 +436,5 @@ libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwe libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-04-13T14:37:24.114251. # python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-04-13T14:37:59.709662. +# python3 vendor-libwebrtc.py --from-local /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src --commit mjfdev libwebrtc +libwebrtc updated from /home/mfroman/git-checkouts/trial-webrtc-builds/moz-libwebrtc-checkout/src commit mjfdev on 2022-04-13T14:38:35.984721.