From 41757af71643cc620161288803e7ffc8dbb9ce10 Mon Sep 17 00:00:00 2001 From: Autoroller Date: Tue, 29 May 2018 06:44:28 -0700 Subject: [PATCH] Roll chromium_revision 04484f1ad8..eb7233cee8 (562301:562409) Change log: https://chromium.googlesource.com/chromium/src/+log/04484f1ad8..eb7233cee8 Full diff: https://chromium.googlesource.com/chromium/src/+/04484f1ad8..eb7233cee8 Roll chromium third_party df47e60355..964479cf94 Change log: https://chromium.googlesource.com/chromium/src/third_party/+log/df47e60355..964479cf94 Changed dependencies: * src/build: https://chromium.googlesource.com/chromium/src/build/+log/39cffdabab..25be5e8c8e * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/9b90eea6f1..e05d522249 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/8092ac5e3a..c23170bef6 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/331f1e2bf6..9077464195 DEPS diff: https://chromium.googlesource.com/chromium/src/+/04484f1ad8..eb7233cee8/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: I06f9e5a125ab145156cf2b5bc8ed5ad93ba4ae41 Reviewed-on: https://webrtc-review.googlesource.com/79640 Reviewed-by: WebRTC Buildbot Commit-Queue: WebRTC Buildbot Cr-Commit-Position: refs/heads/master@{#23433} --- DEPS | 12 ++++++------ third_party/abseil-cpp/BUILD.gn | 11 +++++++++-- .../externs/language_settings_private.js | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/DEPS b/DEPS index 4527477c47..03dfe54245 100644 --- a/DEPS +++ b/DEPS @@ -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': '04484f1ad87b6168ee66c77fa6b58671b156b5e3', + 'chromium_revision': 'eb7233cee8436ea524be3eb000e21c54c1c64f69', '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': 'df47e603552ded44d8fdbbfaa73444aa015c2f0c', + 'chromium_third_party_revision': '964479cf9407b632a1f99af98382eea3d749173b', } deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency @@ -51,7 +51,7 @@ deps = { 'src/base': Var('chromium_git') + '/chromium/src/base' + '@' + '60caf964a31a0c0850372a2e421485f0c783c32c', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '39cffdabab587544c4bb01f3618ea3f7ae65a889', + Var('chromium_git') + '/chromium/src/build' + '@' + '25be5e8c8e4bfc814c6ad19b7e9ff8bd8f44a563', '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 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + '9b90eea6f1e1e92d1557ccf7ffe3741504c73672', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'e05d522249d3a9648341e7492ff133c96c5e1398', 'condition': 'checkout_ios', }, 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '8092ac5e3aac276c87d07a9f53285a36af677d70', + Var('chromium_git') + '/chromium/src/testing' + '@' + 'c23170bef6bfb427056071e71573cf09a3a9991a', # 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'), @@ -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' + '@' + '331f1e2bf624a5835ad5fb89ea882e9ea23a1ca5', + Var('chromium_git') + '/chromium/src/tools' + '@' + '907746419506e2c9cbe6ae07eaf6c46779a97616', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/swarming_client': diff --git a/third_party/abseil-cpp/BUILD.gn b/third_party/abseil-cpp/BUILD.gn index eaaf015cab..d626385320 100644 --- a/third_party/abseil-cpp/BUILD.gn +++ b/third_party/abseil-cpp/BUILD.gn @@ -8,6 +8,8 @@ # opts will be linked together, and in some cases headers compiled with and # without these options will be part of the same program. +import("//build/toolchain/toolchain.gni") + group("default") { deps = [ "absl/types:any", @@ -141,10 +143,15 @@ config("absl_test_cflags_cc") { "-Wno-unused-member-function", "-Wno-unused-parameter", "-Wno-unused-private-field", - "-Wno-unused-template", "-Wno-used-but-marked-unused", - "-Wno-zero-as-null-pointer-constant", ] + 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: diff --git a/third_party/closure_compiler/externs/language_settings_private.js b/third_party/closure_compiler/externs/language_settings_private.js index cd3cfb3ca9..2b041bfbc4 100644 --- a/third_party/closure_compiler/externs/language_settings_private.js +++ b/third_party/closure_compiler/externs/language_settings_private.js @@ -35,7 +35,7 @@ chrome.languageSettingsPrivate.MoveType = { * supportsUI: (boolean|undefined), * supportsSpellcheck: (boolean|undefined), * supportsTranslate: (boolean|undefined), - * isAllowedLocale: (boolean|undefined) + * isAllowedUILocale: (boolean|undefined) * }} * @see https://developer.chrome.com/extensions/languageSettingsPrivate#type-Language */