From 52f56d482a5b03f58a0f1d9dbea018b4240b44c9 Mon Sep 17 00:00:00 2001 From: kjellander Date: Wed, 8 Jun 2016 04:05:19 -0700 Subject: [PATCH] Roll chromium_revision 086802955f..7fa6701bc5 (396351:398458) Change log: https://chromium.googlesource.com/chromium/src/+log/086802955f..7fa6701bc5 Full diff: https://chromium.googlesource.com/chromium/src/+/086802955f..7fa6701bc5 Changed dependencies: * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/06e80a0e17..8dd3c8e39a * src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/54092ffeaa..0fc7df55c0 * src/third_party/libFuzzer/src: https://chromium.googlesource.com/chromium/llvm-project/llvm/lib/Fuzzer.git/+log/feca8e579b..0475f06430 * src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/4f774ac50e..f80d8011a0 DEPS diff: https://chromium.googlesource.com/chromium/src/+/086802955f..7fa6701bc5/DEPS Clang version changed 269902:270823 Details: https://chromium.googlesource.com/chromium/src/+/086802955f..7fa6701bc5/tools/clang/scripts/update.py TBR=marpan@webrtc.org, stefan@webrtc.org, pbos@webrtc.org BUG=webrtc:5956, webrtc:5977 NOTRY=True Review-Url: https://codereview.webrtc.org/2040403002 Cr-Commit-Position: refs/heads/master@{#13062} --- .gn | 1 + DEPS | 2 +- webrtc/supplement.gypi | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gn b/.gn index 7edbc59567..460eae677e 100644 --- a/.gn +++ b/.gn @@ -41,6 +41,7 @@ exec_script_whitelist = [ "//build/config/win/visual_studio_version.gni", "//build/gn_helpers.py", "//build/gypi_to_gn.py", + "//build/toolchain/concurrent_links.gni", "//build/toolchain/gcc_toolchain.gni", "//build/toolchain/mac/BUILD.gn", "//build/toolchain/win/BUILD.gn", diff --git a/DEPS b/DEPS index c0ea65f373..5708c39bd6 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '086802955ffbe67f0a2de987822ae8d18dd5353d', + 'chromium_revision': '7fa6701bc5183bd5a73203d4fe1309f75ccfd5b4', } # NOTE: Use http rather than https; the latter can cause problems for users diff --git a/webrtc/supplement.gypi b/webrtc/supplement.gypi index f1974d73d8..1915205c46 100644 --- a/webrtc/supplement.gypi +++ b/webrtc/supplement.gypi @@ -29,6 +29,10 @@ # libjingle_peerconnection_so file size. 'libyuv_disable_jpeg%': 1, }], + ['OS=="android" and target_arch=="mipsel"', { + # Linking fails with the gold linker: bugs.webrtc.org/5977. + 'linux_use_bundled_gold%': 0, + }], ], }, 'target_defaults': {