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

Roll chromium_revision ddace756be..5e8d8448f9 (558641:558688)

Browse Source 
Change log: ddace756be..5e8d8448f9
Full diff: ddace756be..5e8d8448f9

Roll chromium third_party 15aad43d8b..156f0a4ab7
Change log: 15aad43d8b..156f0a4ab7

Changed dependencies:
* src/ios: cac093c4fd..dab8567b66
* src/tools: 083aa0e99c..c708703ecd
DEPS diff: ddace756be..5e8d8448f9/DEPS

No update to Clang.

BUG=None
CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal
TBR=mbonadei@chromium.org

Change-Id: I36d8f42751339b49e437f718a6709854e674dfdf
Reviewed-on: https://webrtc-review.googlesource.com/76923
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23249}
This commit is contained in:
Mirko Bonadei 2018-05-15 16:16:10 +02:00 committed by Commit Bot
parent 2f1e6d4920
commit d2882187b1
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DEPS
View File

@ -10,7 +10,7 @@ vars = {
'checkout_configuration': 'default',
'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"',
'webrtc_git': 'https://webrtc.googlesource.com',
'chromium_revision': 'ddace756be8170a976bdf1b6c8779dfe2d5c47b6',
'chromium_revision': '5e8d8448f94a844159946daa7d58cdf4305abb91',
'boringssl_git': 'https://boringssl.googlesource.com',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling swarming_client
@ -43,7 +43,7 @@ vars = {
# 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': '15aad43d8b3cd8e38549e345ec6fbef42b3968bd',
'chromium_third_party_revision': '156f0a4ab73afb64f487df9982435b28a52ec9b2',
}
deps = {
# TODO(kjellander): Move this to be Android-only once the libevent dependency
@ -61,7 +61,7 @@ deps = {
'condition': 'checkout_android',
},
'src/ios': {
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'cac093c4fd11086de4844c8485b245e9d9bbbf93',
'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'dab8567b6642f85e8172790f78f5ce464eb3b170',
'condition': 'checkout_ios',
},
'src/testing':
@ -175,7 +175,7 @@ deps = {
'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' + '@' + '083aa0e99cee185b679aa800e38ec19d0505918e',
Var('chromium_git') + '/chromium/src/tools' + '@' + 'c708703ecdb9f7b52686ed57307f42f2d1bca43d',
'src/tools/gyp':
Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb',
'src/tools/swarming_client':

23
third_party/abseil-cpp/BUILD.gn vendored
View File

@ -19,13 +19,23 @@ group("default") {
}
config("absl_include_config") {
# Using -isystem instead of include_dirs (-I), so we don't need to suppress
# warnings coming from Abseil. Doing so would mask warnings in our own code.
if (!is_clang && is_win) {
# MSVC doesn't have -isystem, in that case we fallback to include_dirs and
# we use the warning suppression flags defined in :absl_default_cflags_cc.
include_dirs = [ "." ]
# Using -isystem (with clang and GCC) and -imsvc (with clang-cl) instead of
# include_dirs (-I), so we don't need to suppress warnings coming from
# Abseil. Doing so would mask warnings in our own code.
if (is_win) {
if (is_clang) {
# clang-cl:
cflags = [
"-imsvc",
rebase_path(".", root_build_dir),
]
} else {
# MSVC doesn't have -isystem, in that case we fallback to include_dirs and
# we use the warning suppression flags defined in :absl_default_cflags_cc.
include_dirs = [ "." ]
}
} else {
# GCC or clang:
cflags = [
"-isystem",
rebase_path(".", root_build_dir),
@ -111,6 +121,7 @@ config("absl_default_cflags_cc") {
cflags_cc = [
"/wd4005", # macro-redefinition
"/wd4068", # unknown pragma
"/wd4702", # unreachable code
]
}
}