Roll chromium_revision f2d1e453de..cf1645bec7 (563863:563963)
Change log: https://chromium.googlesource.com/chromium/src/+log/f2d1e453de..cf1645bec7
Full diff: https://chromium.googlesource.com/chromium/src/+/f2d1e453de..cf1645bec7
Roll chromium third_party 02d962eb0e..1b4d922d36
Change log: https://chromium.googlesource.com/chromium/src/third_party/+log/02d962eb0e..1b4d922d36
Changed dependencies:
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/0ecab11ffa..57de7ba6db
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/3c4efebb96..ea9199f1f4
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/8e0b21f69f..c790da9b2a
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/3ae9d12c9d..e10eefe10d
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/b26b30dc08..54e864df3f
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/621fe6f9b5..88087bad47
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/c50cb3b65c..67b206d389
* src/tools/swarming_client: https://chromium.googlesource.com/infra/luci/client-py.git/+log/3543e21830..281c390193
DEPS diff: https://chromium.googlesource.com/chromium/src/+/f2d1e453de..cf1645bec7/DEPS
No update to Clang.
TBR=buildbot@webrtc.org,
BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal
NO_AUTOIMPORT_DEPS_CHECK=true
Change-Id: Ie2daa32df5131e1a11b6f01dbd574879ff000a5d
Reviewed-on: https://webrtc-review.googlesource.com/80773
Commit-Queue: WebRTC Buildbot <buildbot@webrtc.org>
Reviewed-by: WebRTC Buildbot <buildbot@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23500}diff --git a/DEPS b/DEPS
index cac797e..b15463c 100644
--- a/DEPS
+++ b/DEPS
@@ -10,12 +10,12 @@
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
- 'chromium_revision': 'f2d1e453de33756fb4454dd881ba8fa786bed919',
+ 'chromium_revision': 'cf1645bec790f62af30f906c246500ef4b5c0767',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
# and whatever else without interference from each other.
- 'swarming_revision': '3543e21830b9549e5b70c8c49482c8c28da2ba94',
+ 'swarming_revision': '281c390193ec8c02e60279f8dac1b86ac52fa4be',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
@@ -27,7 +27,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling catapult
# and whatever else without interference from each other.
- 'catapult_revision': 'b26b30dc089a201e66b56c6ca9c1725d01e96fde',
+ 'catapult_revision': '54e864df3f870ba7c3b9a47ce392eb1a6db57edc',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling libFuzzer
# and whatever else without interference from each other.
@@ -43,15 +43,15 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Chromium third_party
# and whatever else without interference from each other.
- 'chromium_third_party_revision': '02d962eb0ee2dce2f4f594dece140ca113fb1196',
+ 'chromium_third_party_revision': '1b4d922d3620f03e31e11aa23fce709431e0f9dc',
}
deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency
# in base/third_party/libevent is solved.
'src/base':
- Var('chromium_git') + '/chromium/src/base' + '@' + '0ecab11ffa2c1d8814f237d4ba09c8c50db665fc',
+ Var('chromium_git') + '/chromium/src/base' + '@' + '57de7ba6db7200b4c8cf1a5a2c1fd0e25ae912f6',
'src/build':
- Var('chromium_git') + '/chromium/src/build' + '@' + '3c4efebb96363f6e1dfd576a2860e9653af8abcc',
+ Var('chromium_git') + '/chromium/src/build' + '@' + 'ea9199f1f4c128c4c7dca23a8f3949a59213bb9e',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '893eb86b02b2571894e328f05551112b96df1cce',
# Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC.
@@ -61,11 +61,11 @@
'condition': 'checkout_android',
},
'src/ios': {
- 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '8e0b21f69fbbb602c31a63be1f12053dc5a6bcdb',
+ 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'c790da9b2adad9aae01d33df2910fc02db82daf8',
'condition': 'checkout_ios',
},
'src/testing':
- Var('chromium_git') + '/chromium/src/testing' + '@' + '3ae9d12c9d3fee4f5ed031e80aa3284bab7ca832',
+ Var('chromium_git') + '/chromium/src/testing' + '@' + 'e10eefe10df74e6e0d25465a4d853029ecb0d11d',
# This entry is used for chromium third_party rolling into webrtc third_party only.
'src/third_party_chromium': {
'url': Var('chromium_git') + '/chromium/src/third_party' + '@' + Var('chromium_third_party_revision'),
@@ -94,7 +94,7 @@
'src/third_party/colorama/src':
Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
'src/third_party/depot_tools':
- Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '621fe6f9b56a04d06b4a730cd2867d50282a6490',
+ Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '88087bad47fb55e5e783ef678faddf6174a29a13',
'src/third_party/errorprone/lib': {
'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7',
'condition': 'checkout_android',
@@ -175,7 +175,7 @@
'src/third_party/yasm/source/patched-yasm':
Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc',
'src/tools':
- Var('chromium_git') + '/chromium/src/tools' + '@' + 'c50cb3b65c595e42da19855336123542f6cc623b',
+ Var('chromium_git') + '/chromium/src/tools' + '@' + '67b206d38983cee6bd4df45c0a341ee469719e7d',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn
index 33e8307..4b87207 100644
--- a/third_party/googletest/BUILD.gn
+++ b/third_party/googletest/BUILD.gn
@@ -97,6 +97,7 @@
configs += [ "//build/config/compiler:no_chromium_code" ]
defines = []
+ deps = []
if (is_nacl || !build_with_chromium) {
defines += [ "GTEST_DISABLE_PRINT_STACK_TRACE" ]
sources -= [
@@ -104,15 +105,14 @@
"custom/gtest/internal/custom/stack_trace_getter.h",
]
} else {
- deps = [
- "//base",
+ deps += [ "//base" ]
+ }
+
+ if (is_fuchsia) {
+ deps += [
+ "//third_party/fuchsia-sdk:fdio",
+ "//third_party/fuchsia-sdk:launchpad",
]
- if (is_fuchsia) {
- deps += [
- "//third_party/fuchsia-sdk:fdio",
- "//third_party/fuchsia-sdk:launchpad",
- ]
- }
}
}
