Roll chromium_revision 105c043148..cb8b61b491 (569260:569376)
Change log: https://chromium.googlesource.com/chromium/src/+log/105c043148..cb8b61b491
Full diff: https://chromium.googlesource.com/chromium/src/+/105c043148..cb8b61b491
Roll chromium third_party 6cd8e71424..b0f19bfaad
Change log: https://chromium.googlesource.com/chromium/src/third_party/+log/6cd8e71424..b0f19bfaad
Changed dependencies:
* src/base: https://chromium.googlesource.com/chromium/src/base/+log/95c3466bc7..4d325e07ed
* src/build: https://chromium.googlesource.com/chromium/src/build/+log/7ccebdabd9..c3e2883ba8
* src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/a5c76c8f1d..720bfc790a
* src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/7c8625bcae..12897eb458
* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/44fc6f687b..53842b6cbc
* src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/a28b14f122..04925ac3f7
* src/third_party/icu: https://chromium.googlesource.com/chromium/deps/icu.git/+log/f61e46dbee..172d33141c
* src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/7d0c51bb6e..674f7d10b4
DEPS diff: https://chromium.googlesource.com/chromium/src/+/105c043148..cb8b61b491/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: I364bd1247061abf1532c89587d22f819fcb2e73e
Reviewed-on: https://webrtc-review.googlesource.com/84880
Commit-Queue: WebRTC Buildbot <buildbot@webrtc.org>
Reviewed-by: WebRTC Buildbot <buildbot@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23717}diff --git a/DEPS b/DEPS
index d377ab0..ff137d3 100644
--- a/DEPS
+++ b/DEPS
@@ -10,7 +10,7 @@
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
- 'chromium_revision': '105c0431482238b421f530a437744e1d28c30968',
+ 'chromium_revision': 'cb8b61b491aad9c3b36dbfd705d52a7bfc3c2dda',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@@ -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': '44fc6f687b352f954863d75823765b501823b175',
+ 'catapult_revision': '53842b6cbc1fbab4f69ed5b9c2c30babd61cefbd',
# 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': '6cd8e7142412f3ae1ce8f5c6f36558ca91ad9579',
+ 'chromium_third_party_revision': 'b0f19bfaad365c8ae66dec47bd32419ab6e722fb',
}
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' + '@' + '95c3466bc77400e99472d851e4688d5097c906da',
+ Var('chromium_git') + '/chromium/src/base' + '@' + '4d325e07edba19e2d68211f88546d799e70b5961',
'src/build':
- Var('chromium_git') + '/chromium/src/build' + '@' + '7ccebdabd925366bd5d3d0f3f74334c6fade22c8',
+ Var('chromium_git') + '/chromium/src/build' + '@' + 'c3e2883ba813bc535ffe877ffd69a98804e3edc1',
'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '5941c1b3df96c1db756a2834343533335c394c4a',
# 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' + '@' + 'a5c76c8f1d4de58a4060d5de4994c0204821f733',
+ 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '720bfc790a30282ce2685ea7cae2bdc7adc5f20a',
'condition': 'checkout_ios',
},
'src/testing':
- Var('chromium_git') + '/chromium/src/testing' + '@' + '7c8625bcaeca79e59091181a04770c245696a58c',
+ Var('chromium_git') + '/chromium/src/testing' + '@' + '12897eb458ff505af7ffaccff2b74cc0f9e2e920',
# 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' + '@' + 'a28b14f122463a6d73c623e77c9dea4e228322dc',
+ Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '04925ac3f7e50988945be3a5655198736a8b3e58',
'src/third_party/errorprone/lib': {
'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '980d49e839aa4984015efed34b0134d4b2c9b6d7',
'condition': 'checkout_android',
@@ -115,7 +115,7 @@
'src/third_party/googletest/src':
Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + 'ce468a17c434e4e79724396ee1b51d86bfc8a88b',
'src/third_party/icu': {
- 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'f61e46dbee9d539a32551493e3bcc1dea92f83ec',
+ 'url': Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '172d33141cd16df9d027cfd49bfe940b1dc66f1a',
},
'src/third_party/jsr-305/src': {
'url': Var('chromium_git') + '/external/jsr-305.git' + '@' + '642c508235471f7220af6d5df2d3210e3bfc0919',
@@ -185,7 +185,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' + '@' + '7d0c51bb6e9929b061516ec80d35ee2992d25783',
+ Var('chromium_git') + '/chromium/src/tools' + '@' + '674f7d10b44126d54ddced36f0dd71a8d6b31b92',
'src/tools/swarming_client':
Var('chromium_git') + '/infra/luci/client-py.git' + '@' + Var('swarming_revision'),
diff --git a/third_party/abseil-cpp/BUILD.gn b/third_party/abseil-cpp/BUILD.gn
index d626385..6005148 100644
--- a/third_party/abseil-cpp/BUILD.gn
+++ b/third_party/abseil-cpp/BUILD.gn
@@ -2,8 +2,6 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-# absl specific compiler flags.
-#
# Flags specified here must not impact ABI. Code compiled with and without these
# opts will be linked together, and in some cases headers compiled with and
# without these options will be part of the same program.
@@ -50,53 +48,10 @@
}
config("absl_default_cflags_cc") {
+ cflags_cc = []
if (is_clang) {
- cflags_cc = [
- # Abseil does not support C++98
- "-Wno-c++98-compat-pedantic",
- # Turns off all implicit conversion warnings. Most are re-enabled below.
- "-Wno-conversion",
- "-Wno-covered-switch-default",
- "-Wno-deprecated",
- "-Wno-disabled-macro-expansion",
- "-Wno-double-promotion",
- ###
- # Turned off as they include valid C++ code.
- "-Wno-comma",
- "-Wno-extra-semi",
- "-Wno-packed",
- "-Wno-padded",
- ###
- "-Wno-float-conversion",
- "-Wno-float-equal",
- "-Wno-format-nonliteral",
- # Too aggressive: warns on Clang extensions enclosed in Clang-only
- # compilation paths.
- "-Wno-gcc-compat",
- ###
- # Some internal globals are necessary. Don't do this at home.
- "-Wno-global-constructors",
- "-Wno-exit-time-destructors",
- ###
- "-Wno-nested-anon-types",
- "-Wno-non-modular-include-in-module",
- "-Wno-old-style-cast",
- # Warns on preferred usage of non-POD types such as string_view
- "-Wno-range-loop-analysis",
- "-Wno-reserved-id-macro",
- "-Wno-shorten-64-to-32",
- "-Wno-switch-enum",
- "-Wno-thread-safety-negative",
- "-Wno-undef",
- "-Wno-unknown-warning-option",
- "-Wno-unreachable-code",
- # Causes warnings on include guards
- "-Wno-unused-macros",
- "-Wno-weak-vtables",
- ###
- # Implicit conversion warnings turned off by -Wno-conversion
- # which are re-enabled below.
- "-Wbitfield-enum-conversion",
+ cflags_cc += [
+ # TODO(crbug.com/588506): Explicitly enable conversion warnings.
"-Wbool-conversion",
"-Wconstant-conversion",
"-Wenum-conversion",
@@ -107,69 +62,36 @@
"-Wobjc-literal-conversion",
"-Wno-sign-conversion",
"-Wstring-conversion",
- ###
]
- } else {
- if (is_linux) {
- # GCC flags:
- cflags_cc = [
- # Google style does not use unsigned integers, though STL containers
- # have unsigned types.
- "-Wno-sign-compare",
- ]
+ if (!is_nacl && !use_xcode_clang) {
+ cflags_cc += [ "-Wbitfield-enum-conversion" ]
}
- if (is_win) {
- # MSVC flags:
- cflags_cc = [
- "/wd4005", # macro-redefinition
- "/wd4068", # unknown pragma
- "/wd4702", # unreachable code
- ]
- }
+ }
+ if (is_win) {
+ cflags_cc += [
+ "/wd4005", # macro-redefinition
+ "/wd4068", # unknown pragma
+ "/wd4702", # unreachable code
+ ]
}
}
config("absl_test_cflags_cc") {
- if (is_clang) {
- cflags_cc = [
- "-Wno-c99-extensions",
- "-Wno-missing-noreturn",
- "-Wno-missing-prototypes",
- "-Wno-null-conversion",
- "-Wno-shadow",
- "-Wno-shift-sign-overflow",
+ cflags_cc = []
+ if (is_clang || !is_win) {
+ cflags_cc += [
+ "-Wno-conversion-null",
+ "-Wno-missing-declarations",
"-Wno-sign-compare",
"-Wno-unused-function",
- "-Wno-unused-member-function",
"-Wno-unused-parameter",
"-Wno-unused-private-field",
- "-Wno-used-but-marked-unused",
]
- if (!use_xcode_clang) {
- # xcode clang does not recognize the following flags.
- cflags_cc += [
- "-Wno-unused-template",
- "-Wno-zero-as-null-pointer-constant",
- ]
- }
- } else {
- if (is_linux) {
- # GCC flags:
- cflags_cc = [
- "-Wno-conversion-null",
- "-Wno-missing-declarations",
- "-Wno-sign-compare",
- "-Wno-unused-function",
- "-Wno-unused-parameter",
- "-Wno-unused-private-field",
- ]
- }
- if (is_win) {
- # MSVC flags:
- cflags_cc = [
- "/wd4018", # signed/unsigned mismatch
- "/wd4101", # unreferenced local variable
- ]
- }
+ }
+ if (is_win) {
+ cflags_cc += [
+ "/wd4018", # signed/unsigned mismatch
+ "/wd4101", # unreferenced local variable
+ ]
}
}
diff --git a/third_party/guava/BUILD.gn b/third_party/guava/BUILD.gn
index 01cb6b0..57d6e1b 100644
--- a/third_party/guava/BUILD.gn
+++ b/third_party/guava/BUILD.gn
@@ -9,9 +9,8 @@
# the full guava and one that supports android. Please keep the versions in
# sync with one another.
-java_prebuilt("guava_android_java") {
+android_java_prebuilt("guava_android_java") {
testonly = true
- supports_android = true
jar_path = "lib/guava-android.jar"
# Avoids dependency cycle.
