From 1d77c3ef17c6745d2fd276f884ff868dc7e71bd5 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Tue, 26 Jan 2021 17:10:04 +0100 Subject: [PATCH] Fix roll chromium_revision 18311e2720..e3ed290da5 (844473:846763) Change log: https://chromium.googlesource.com/chromium/src/+log/18311e2720..e3ed290da5 Full diff: https://chromium.googlesource.com/chromium/src/+/18311e2720..e3ed290da5 Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/f7f5bac81f..5397c2600c * src/build: https://chromium.googlesource.com/chromium/src/build/+log/43dd249695..4ba9b31907 * src/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/c38b5ab1c6..13547b97da * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/ad2e59ea45..8790968c74 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/ca81cc1c21..01cab16640 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/3ee03ddfde..cc28b65885 * src/third_party/android_deps/libs/androidx_activity_activity: version:1.1.0-cr0..version:1.3.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_annotation_annotation: version:1.2.0-alpha01-cr0..version:1.2.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_appcompat_appcompat: version:1.2.0-beta01-cr0..version:1.3.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_appcompat_appcompat_resources: version:1.2.0-cr0..version:1.3.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_fragment_fragment: version:1.2.5-cr0..version:1.4.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_gridlayout_gridlayout: version:1.0.0-cr0..version:1.1.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_leanback_leanback: version:1.0.0-cr0..version:1.1.0-beta01-cr0 * src/third_party/android_deps/libs/androidx_leanback_leanback_preference: version:1.0.0-cr0..version:1.1.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common: version:2.2.0-cr0..version:2.4.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common_java8: version:2.0.0-cr0..version:2.4.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata: version:2.0.0-cr0..version:2.4.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core: version:2.2.0-cr0..version:2.4.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime: version:2.2.0-cr0..version:2.4.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel: version:2.2.0-cr0..version:2.4.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate: version:2.2.0-cr0..version:2.4.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_preference_preference: version:1.1.1-cr0..version:1.2.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_recyclerview_recyclerview: version:1.2.0-alpha06-cr0..version:1.2.0-beta01-cr0 * src/third_party/android_deps/libs/androidx_savedstate_savedstate: version:1.0.0-cr0..version:1.2.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_slice_slice_builders: version:1.0.0-cr0..version:1.1.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_slice_slice_core: version:1.0.0-cr0..version:1.1.0-SNAPSHOT-cr0 * src/third_party/android_deps/libs/androidx_transition_transition: version:1.4.0-SNAPSHOT-cr0..version:1.5.0-SNAPSHOT-cr0 * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/f8f35c9555..c47bfce062 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/cf567b6b96..957dfeae29 * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/dabd965527..f08e425f2d * src/third_party/freetype/src: https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/03ceda9701..c7cc947c0f * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/2d79f95e90..122834484a * src/third_party/usrsctp/usrsctplib: https://chromium.googlesource.com/external/github.com/sctplab/usrsctp/+log/a3c3ef666b..07f871bda2 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/c952341d24..262a9440ba * src/tools/swarming_client: https://chromium.googlesource.com/infra/luci/client-py.git/+log/1a072711d4..a32a1607f6 Added dependencies * src/third_party/android_deps/libs/androidx_remotecallback_remotecallback * src/third_party/android_deps/libs/androidx_tracing_tracing Removed dependency * src/third_party/android_deps/libs/androidx_legacy_legacy_preference_v14 DEPS diff: https://chromium.googlesource.com/chromium/src/+/18311e2720..e3ed290da5/DEPS Clang version changed llvmorg-12-init-16296-g5e476061:llvmorg-12-init-17251-g6de48655 Details: https://chromium.googlesource.com/chromium/src/+/18311e2720..e3ed290da5/tools/clang/scripts/update.py TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com, BUG=None Change-Id: I5879700bb906a7356c4fdecc6fbef52268dbf6ba Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/203887 Reviewed-by: Artem Titov Commit-Queue: Mirko Bonadei Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#33076} --- DEPS | 105 +++++++++++++++++++++++++++++------------------------ webrtc.gni | 9 +++++ 2 files changed, 67 insertions(+), 47 deletions(-) diff --git a/DEPS b/DEPS index c836d23e57..467d5c3153 100644 --- a/DEPS +++ b/DEPS @@ -7,31 +7,31 @@ vars = { # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': '18311e2720c3027c11321a8b5fa6ab0fdf30bd08', + 'chromium_revision': 'e3ed290da5f111b55ae72de3eaf8ea249d057867', } 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@f7f5bac81fdf7acfaecc2cd99a06ff090565ac91', + 'https://chromium.googlesource.com/chromium/src/base@5397c2600cd12781d5d0bb9a65178e9b2981eefb', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@43dd2496951592fa103e98c29e69e1d3d1da18b7', + 'https://chromium.googlesource.com/chromium/src/build@4ba9b319074accc34cfc309a240e3bab1dbad7ab', 'src/buildtools': - 'https://chromium.googlesource.com/chromium/src/buildtools@c38b5ab1c6f5a4913afe49709f7acde15229f400', + 'https://chromium.googlesource.com/chromium/src/buildtools@13547b97dad2cdf1b3726b07b2563b921068a018', # Gradle 6.6.1. Used for testing Android Studio project generation for WebRTC. 'src/examples/androidtests/third_party/gradle': { 'url': 'https://chromium.googlesource.com/external/github.com/gradle/gradle.git@f2d1fb54a951d8b11d25748e4711bec8d128d7e3', 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@ad2e59ea457e25076ee99e851cf8e48eef57ca76', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@8790968c74e187522e29fe438f9a6ef447e7ebe5', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@ca81cc1c2148cc6fb62dd4139f2dc7a19301d66a', + 'https://chromium.googlesource.com/chromium/src/testing@01cab16640b4bd5596d5c396002d706b0e414f76', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@3ee03ddfde253208e6ae8b2e8debc459cd7d5393', + 'https://chromium.googlesource.com/chromium/src/third_party@cc28b65885fae1d9f5a4f5588dcfd46e03049285', 'src/buildtools/linux64': { 'packages': [ @@ -118,18 +118,18 @@ deps = { }, 'src/third_party/boringssl/src': - 'https://boringssl.googlesource.com/boringssl.git@f8f35c95550e6796ab8b2c0f8e37e7ce4bc67302', + 'https://boringssl.googlesource.com/boringssl.git@c47bfce062cc5a1b462176be626338224ae2a346', 'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@e3d485f73f5836fdd6fb287ab96973c4f63175e1', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@cf567b6b961687e00cdc2ded7bcb4fc72379fa59', + 'https://chromium.googlesource.com/catapult.git@957dfeae2968ae6cde9d8f44c91ff1a78d903f9f', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, 'src/third_party/colorama/src': 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/depot_tools': - 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@dabd9655278a9ba3ce753496cd4f6c4b17f5d779', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@f08e425f2d22be925f3aa2952c5a6a958a26f97a', 'src/third_party/ffmpeg': 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@841aa72c9e153ae5f952e31e4b6406870555922d', 'src/third_party/findbugs': { @@ -142,7 +142,7 @@ deps = { 'condition': 'checkout_linux', }, 'src/third_party/freetype/src': - 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@03ceda9701cd8c08ea5b4ee0c2d558a98fc4ed7d', + 'https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@c7cc947c0f3225a5b01e14456c65a8e3162dfd4c', 'src/third_party/harfbuzz-ng/src': 'https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@53806e5b83cee0e275eac038d0780f95ac56588c', 'src/third_party/google_benchmark/src': { @@ -200,7 +200,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@2d79f95e908dcbae188e1fedd12e8424cbd14392', + 'https://android.googlesource.com/platform/external/perfetto.git@122834484af3d2f68b0ee0320d0e9e08e4d59bad', 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@576e0801f9281fd54e2c69ad5be5fef7af656011', 'src/third_party/libyuv': @@ -250,16 +250,16 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/usrsctp/usrsctplib': - 'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@a3c3ef666b7a5e4c93ebae5a7462add6f86f5cf2', + 'https://chromium.googlesource.com/external/github.com/sctplab/usrsctp@07f871bda23943c43c9e74cc54f25130459de830', # Dependency used by libjpeg-turbo. 'src/third_party/yasm/binaries': { 'url': 'https://chromium.googlesource.com/chromium/deps/yasm/binaries.git@52f9b3f4b0aa06da24ef8b123058bb61ee468881', 'condition': 'checkout_win', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@c952341d24772111b9985c60a27fde13f89b7152', + 'https://chromium.googlesource.com/chromium/src/tools@262a9440ba4b2019c922237737506c110c580731', 'src/tools/swarming_client': - 'https://chromium.googlesource.com/infra/luci/client-py.git@1a072711d4388c62e02480fabc26c68c24494be9', + 'https://chromium.googlesource.com/infra/luci/client-py.git@a32a1607f6093d338f756c7e7c7b4333b0c50c9c', 'src/third_party/accessibility_test_framework': { 'packages': [ @@ -577,7 +577,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_activity_activity', - 'version': 'version:1.1.0-cr0', + 'version': 'version:1.3.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -588,7 +588,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_annotation_annotation', - 'version': 'version:1.2.0-alpha01-cr0', + 'version': 'version:1.2.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -610,7 +610,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_appcompat_appcompat', - 'version': 'version:1.2.0-beta01-cr0', + 'version': 'version:1.3.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -621,7 +621,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_appcompat_appcompat_resources', - 'version': 'version:1.2.0-cr0', + 'version': 'version:1.3.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -786,7 +786,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_fragment_fragment', - 'version': 'version:1.2.5-cr0', + 'version': 'version:1.4.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -797,7 +797,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_gridlayout_gridlayout', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -819,7 +819,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_leanback_leanback', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.0-beta01-cr0', }, ], 'condition': 'checkout_android', @@ -830,18 +830,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_leanback_leanback_preference', - 'version': 'version:1.0.0-cr0', - }, - ], - 'condition': 'checkout_android', - 'dep_type': 'cipd', - }, - - 'src/third_party/android_deps/libs/androidx_legacy_legacy_preference_v14': { - 'packages': [ - { - 'package': 'chromium/third_party/android_deps/libs/androidx_legacy_legacy_preference_v14', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -885,7 +874,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common', - 'version': 'version:2.2.0-cr0', + 'version': 'version:2.4.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -896,7 +885,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_common_java8', - 'version': 'version:2.0.0-cr0', + 'version': 'version:2.4.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -907,7 +896,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata', - 'version': 'version:2.0.0-cr0', + 'version': 'version:2.4.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -918,7 +907,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_livedata_core', - 'version': 'version:2.2.0-cr0', + 'version': 'version:2.4.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -929,7 +918,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_runtime', - 'version': 'version:2.2.0-cr0', + 'version': 'version:2.4.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -940,7 +929,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel', - 'version': 'version:2.2.0-cr0', + 'version': 'version:2.4.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -951,7 +940,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_lifecycle_lifecycle_viewmodel_savedstate', - 'version': 'version:2.2.0-cr0', + 'version': 'version:2.4.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -1028,7 +1017,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_preference_preference', - 'version': 'version:1.1.1-cr0', + 'version': 'version:1.2.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -1050,7 +1039,18 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_recyclerview_recyclerview', - 'version': 'version:1.2.0-alpha06-cr0', + 'version': 'version:1.2.0-beta01-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + + 'src/third_party/android_deps/libs/androidx_remotecallback_remotecallback': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_remotecallback_remotecallback', + 'version': 'version:1.0.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -1061,7 +1061,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_savedstate_savedstate', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.2.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -1072,7 +1072,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_slice_slice_builders', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -1083,7 +1083,7 @@ deps = { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_slice_slice_core', - 'version': 'version:1.0.0-cr0', + 'version': 'version:1.1.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', @@ -1233,11 +1233,22 @@ deps = { 'dep_type': 'cipd', }, + 'src/third_party/android_deps/libs/androidx_tracing_tracing': { + 'packages': [ + { + 'package': 'chromium/third_party/android_deps/libs/androidx_tracing_tracing', + 'version': 'version:1.0.0-cr0', + }, + ], + 'condition': 'checkout_android', + 'dep_type': 'cipd', + }, + 'src/third_party/android_deps/libs/androidx_transition_transition': { 'packages': [ { 'package': 'chromium/third_party/android_deps/libs/androidx_transition_transition', - 'version': 'version:1.4.0-SNAPSHOT-cr0', + 'version': 'version:1.5.0-SNAPSHOT-cr0', }, ], 'condition': 'checkout_android', diff --git a/webrtc.gni b/webrtc.gni index 05a230c4f1..bf2343a847 100644 --- a/webrtc.gni +++ b/webrtc.gni @@ -475,6 +475,15 @@ template("rtc_test") { xctest_module_target = "//base/test:google_test_runner" } } + if (using_sanitizer) { + if (is_linux) { + if (!defined(invoker.data)) { + data = [] + } + data += + [ "//third_party/llvm-build/Release+Asserts/lib/libstdc++.so.6" ] + } + } } }