From 98be31b73c57239c2290a1fc22909dbcda18fb5e Mon Sep 17 00:00:00 2001 From: Michael Froman Date: Thu, 14 Jul 2022 17:32:02 -0500 Subject: [PATCH] Bug 1766646 - Vendor libwebrtc from cc001e2d2a Upstream commit: https://webrtc.googlesource.com/src/+/cc001e2d2aab33c3e3162c3da86c1aaec7b0a76a Roll chromium_revision 4e4f0e90f9..31252298ae (1000962:1001089) Change log: https://chromium.googlesource.com/chromium/src/+log/4e4f0e90f9..31252298ae Full diff: https://chromium.googlesource.com/chromium/src/+/4e4f0e90f9..31252298ae Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/c9a95d8018..814a388195 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/5478108ef9..d0853d6aba * src/buildtools/third_party/libc++abi/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git/+log/fb82ddb71c..ac1834f0f9 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/833dc94691..9b57c9bee3 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/ce3f74eb9a..fda484aa24 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/5bc565e70d..b7a54c707c * src/third_party/androidx: Z0dpz6ioZwh1ZUWtGx7SsGHJMmDwTZNAqQPu2b9hxmgC..48HadkCKkokYMFcxC-_3ZrScczT4OtasjYbvpfV08W8C * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/dd233aed4e..b8a4d048e6 * src/third_party/turbine: zB1ls771w8S0URcjvMWxOHJ33pmUKq5Zr8zkbIMfvcsC..FJ-IOPRGQsHUZwVeYmVw_idRk5mUUP6_Uj2i6mKQlEMC * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/81f0ee7fc8..d4370e26d0 DEPS diff: https://chromium.googlesource.com/chromium/src/+/4e4f0e90f9..31252298ae/DEPS No update to Clang. BUG=None Change-Id: Id799330e92ac7d1aba019e9f20858055c6cacd08 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/261763 Bot-Commit: Autoroller Commit-Queue: Autoroller Cr-Commit-Position: refs/heads/main@{#36821} --- third_party/libwebrtc/DEPS | 22 +++++++++++----------- third_party/libwebrtc/README.moz-ff-commit | 3 +++ third_party/libwebrtc/README.mozilla | 2 ++ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/third_party/libwebrtc/DEPS b/third_party/libwebrtc/DEPS index 9e023111c816..b1be52062deb 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': '4e4f0e90f9989889d953739f260d95213fc2bb46', + 'chromium_revision': '31252298ae12922b1061cccd8e9a9126f010581c', # Keep the Chromium default of generating location tags. 'generate_location_tags': True, @@ -23,9 +23,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@c9a95d80186f4b4a7d62f5c21b4c6c09d66cf896', + 'https://chromium.googlesource.com/chromium/src/base@814a388195137f17d184d10769e3c70b256a43b0', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@5478108ef9649134ddf8f2f9a68167d7db44af73', + 'https://chromium.googlesource.com/chromium/src/build@d0853d6aba50213238a81848ca64e729d2f15b08', 'src/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools@7208eddba161d85108097c3c5975264c04e3cad8', # Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC. @@ -34,13 +34,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@833dc946911c3e01ef00069b5752d96628b3502c', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@9b57c9bee347acb3b924ff44b31cd73ed3ae4377', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@ce3f74eb9accca41e6bfe816858ab1b1be5f3f65', + 'https://chromium.googlesource.com/chromium/src/testing@fda484aa248b436fa8345f5012c712669fa1a7d9', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@5bc565e70d36299eb8ccd20c68eea85d2afe94b6', + 'https://chromium.googlesource.com/chromium/src/third_party@b7a54c707c62273c0c781e2df45ee8357c19c646', 'src/buildtools/linux64': { 'packages': [ @@ -78,7 +78,7 @@ deps = { 'src/buildtools/third_party/libc++/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git@79a2e924d96e2fc1e4b937c42efd08898fa472d7', 'src/buildtools/third_party/libc++abi/trunk': - 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@fb82ddb71cd5bbeee7367086dd76d4ca9b0ff240', + 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git@ac1834f0f916390fd9fe9addb498ba644a76a119', 'src/buildtools/third_party/libunwind/trunk': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git@3d54d41c27afba1e3a83303c1bc005d303d40eb6', @@ -220,7 +220,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@dd233aed4e705bdb27ab26ae01189ab1e9e3728e', + 'https://android.googlesource.com/platform/external/perfetto.git@b8a4d048e671a7bc14dbb8b30b620cfa4272bcb3', 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@665f6a3065555317e75915af2561cf9b776e50b6', 'src/third_party/libyuv': @@ -275,7 +275,7 @@ deps = { 'condition': 'checkout_win', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@81f0ee7fc80fe1a2fe8ccfcf3d7fd3931c86e1ae', + 'https://chromium.googlesource.com/chromium/src/tools@d4370e26d0cf1a3d5127e1f34d5effd8bca2403d', 'src/third_party/accessibility_test_framework': { 'packages': [ @@ -363,7 +363,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'Z0dpz6ioZwh1ZUWtGx7SsGHJMmDwTZNAqQPu2b9hxmgC', + 'version': '48HadkCKkokYMFcxC-_3ZrScczT4OtasjYbvpfV08W8C', }, ], 'condition': 'checkout_android', @@ -453,7 +453,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/turbine', - 'version': 'zB1ls771w8S0URcjvMWxOHJ33pmUKq5Zr8zkbIMfvcsC', + 'version': 'FJ-IOPRGQsHUZwVeYmVw_idRk5mUUP6_Uj2i6mKQlEMC', }, ], 'condition': 'checkout_android', diff --git a/third_party/libwebrtc/README.moz-ff-commit b/third_party/libwebrtc/README.moz-ff-commit index 3ddc68f9b87f..90669af5c497 100644 --- a/third_party/libwebrtc/README.moz-ff-commit +++ b/third_party/libwebrtc/README.moz-ff-commit @@ -14001,3 +14001,6 @@ cb7c7366d0 # 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 6be3e788f5 +# 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 +cc001e2d2a diff --git a/third_party/libwebrtc/README.mozilla b/third_party/libwebrtc/README.mozilla index f41374836787..03dc6c4de83d 100644 --- a/third_party/libwebrtc/README.mozilla +++ b/third_party/libwebrtc/README.mozilla @@ -9346,3 +9346,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-07-14T22:08:08.046581. # 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-07-14T22:08:48.892943. +# 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-07-14T22:31:57.810733.