admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roll chromium_revision 474eca0589..b0784bef91 (581204:581665)

Browse Source 
Manual change: turn off gtest_enable_absl_printers for now since it
appears they broke that mode upstream.

Change log: https://chromium.googlesource.com/chromium/
    src/+log/474eca0589..b0784bef91
Full diff: https://chromium.googlesource.com/chromium/
    src/+/474eca0589..b0784bef91

Changed dependencies:
* src/base: https://chromium.googlesource.com/chromium/src/base/
      +log/8385797d0c..76793f5417
* src/build: https://chromium.googlesource.com/chromium/src/build/
      +log/f24ca38e53..03ce38cdd9
* src/ios: https://chromium.googlesource.com/chromium/src/ios/
      +log/037c6dcb8c..7c0de39a86
* src/testing: https://chromium.googlesource.com/chromium/src/testing/
      +log/75bb85f253..72f3763b1f
* src/third_party: https://chromium.googlesource.com/chromium/src/
      /third_party/+log/51ecceccb2..28c1ea1319
* src/third_party/boringssl/src:
      https://boringssl.googlesource.com/boringssl.git/
           +log/c7db3232c3..6410e18e91
* src/third_party/catapult:
      https://chromium.googlesource.com/catapult.git/
           +log/3cb00fbd56..9aa552b157
* src/third_party/depot_tools:
      https://chromium.googlesource.com/chromium/tools/depot_tools.git/
           +log/2ebf9fdade..dd5051fa52
* src/third_party/googletest/src:
      https://chromium.googlesource.com/external/github.com/google/
           googletest.git/+log/ce468a17c4..d526632675
* src/third_party/libFuzzer/src:
      https://chromium.googlesource.com/chromium/llvm-project/
            compiler-rt/lib/fuzzer.git/+log/9dfdc2758f..658ff786a2
* src/tools: https://chromium.googlesource.com/chromium/src/tools/
      +log/f01fd4bf32..93447e2d7b
DEPS diff: https://chromium.googlesource.com/chromium/src/+/
      474eca0589..b0784bef91/DEPS

No update to Clang.

TBR=buildbot@webrtc.org,
BUG=None

Change-Id: Ib6f1350df21169068cf0ceba08286d41adc9f181
Reviewed-on: https://webrtc-review.googlesource.com/93288
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24246}
This commit is contained in:
Patrik Höglund 2018-08-09 13:21:41 +02:00 committed by Commit Bot
parent 9b32e389bf
commit 7a91e1383e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gn
View File

@ -80,5 +80,5 @@ default_args = {
# for unittests, it can be disabled (see third_party/libyuv/BUILD.gn) # for unittests, it can be disabled (see third_party/libyuv/BUILD.gn)
libyuv_use_gflags = false libyuv_use_gflags = false
gtest_enable_absl_printers = true gtest_enable_absl_printers = false
} }

20
DEPS
View File

@ -7,7 +7,7 @@ vars = {
'checkout_configuration': 'default', 'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com', 'webrtc_git': 'https://webrtc.googlesource.com',
'chromium_revision': '46dc99a535e2fe9935ac5338b4e28e134dd558c3', 'chromium_revision': 'b0784bef916569b6e4f06a6dce95b75a8a2cf10a',
'boringssl_git': 'https://boringssl.googlesource.com', 'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client # the commit queue can handle CLs rolling swarming_client
@ -16,7 +16,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL # the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other. # and whatever else without interference from each other.
'boringssl_revision': 'c7db3232c397aa3feb1d474d63a1c4dd674b6349', 'boringssl_revision': '6410e18e9190b6b0c71955119fbf3cae1b9eedb7',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling lss # the commit queue can handle CLs rolling lss
# and whatever else without interference from each other. # and whatever else without interference from each other.
@ -28,7 +28,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libFuzzer # the commit queue can handle CLs rolling libFuzzer
# and whatever else without interference from each other. # and whatever else without interference from each other.
'libfuzzer_revision': '9dfdc2758f261f1900cabed6fe13e3c044ad47d7', 'libfuzzer_revision': '658ff786a213703ff0df6ba4a288e9a1e218c074',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling freetype # the commit queue can handle CLs rolling freetype
# and whatever else without interference from each other. # and whatever else without interference from each other.
@ -42,9 +42,9 @@ deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency # TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved. # in base/third_party/libevent is solved.
'src/base': 'src/base':
Var('chromium_git') + '/chromium/src/base' + '@' + '87f482e62077d9806dc257b16fed3cb152cda75e', Var('chromium_git') + '/chromium/src/base' + '@' + '76793f54174ca2e05ac0c8c040e78f95b2d9991b',
'src/build': 'src/build':
Var('chromium_git') + '/chromium/src/build' + '@' + 'fc78dd3a5b88a3efacd402837bca57a45b894413', Var('chromium_git') + '/chromium/src/build' + '@' + '03ce38cdd96271ee139d25f08471e4a2755d3715',
'src/buildtools': 'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '9a90d9aaadeb5e04327ed05775f45132e4b3523f', Var('chromium_git') + '/chromium/buildtools.git' + '@' + '9a90d9aaadeb5e04327ed05775f45132e4b3523f',
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
@ -54,13 +54,13 @@ deps = {
'condition': 'checkout_android', 'condition': 'checkout_android',
}, },
'src/ios': { 'src/ios': {
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '578881518272ed2550ccc3bcdd7f65dc4522734d', 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '7c0de39a86d1acca708ee3ae8feda7c3c5959e16',
'condition': 'checkout_ios', 'condition': 'checkout_ios',
}, },
'src/testing': 'src/testing':
Var('chromium_git') + '/chromium/src/testing' + '@' + '20ed680d2fb24039f83c4e0b5732e88b4f2b9692', Var('chromium_git') + '/chromium/src/testing' + '@' + '72f3763b1ff2f9050ca5b576bda60a72fc25c5ee',
'src/third_party': 'src/third_party':
Var('chromium_git') + '/chromium/src/third_party' + '@' + 'a3f74eae3b4f3dee73c1cd0edc655abd2ca968a6', Var('chromium_git') + '/chromium/src/third_party' + '@' + '28c1ea1319fc7ebe8f7f4df18d16380315043197',
'src/third_party/android_ndk': { 'src/third_party/android_ndk': {
'url': Var('chromium_git') + '/android_ndk.git' + '@' + '5cd86312e794bdf542a3685c6f10cbb96072990b', 'url': Var('chromium_git') + '/android_ndk.git' + '@' + '5cd86312e794bdf542a3685c6f10cbb96072990b',
'condition': 'checkout_android', 'condition': 'checkout_android',
@ -103,7 +103,7 @@ deps = {
'src/third_party/gtest-parallel': 'src/third_party/gtest-parallel':
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + 'fe7f791f14769390d0b124ef8231cde4d575eb12', Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + 'fe7f791f14769390d0b124ef8231cde4d575eb12',
'src/third_party/googletest/src': 'src/third_party/googletest/src':
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'ce468a17c434e4e79724396ee1b51d86bfc8a88b', Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'd5266326752f0a1dadbd310932d8f4fd8c3c5e7d',
'src/third_party/icu': { 'src/third_party/icu': {
'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '297a4dd02b9d36c92ab9b4f121e433c9c3bc14f8', 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '297a4dd02b9d36c92ab9b4f121e433c9c3bc14f8',
}, },
@ -175,7 +175,7 @@ deps = {
'src/third_party/yasm/source/patched-yasm': 'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '720b70524a4424b15fc57e82263568c8ba0496ad', Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + '720b70524a4424b15fc57e82263568c8ba0496ad',
'src/tools': 'src/tools':
Var('chromium_git') + '/chromium/src/tools' + '@' + 'd6e9edbf644f760d301c48934cd10d1e5052c639', Var('chromium_git') + '/chromium/src/tools' + '@' + '93447e2d7b0650d76a38d090db798ce2208e27a9',
'src/tools/swarming_client': 'src/tools/swarming_client':
Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'), Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),