From a817c1524013e06a9175fcd8132bfb86836bcc33 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 18 Jul 2016 15:41:35 -0700 Subject: [PATCH] roll chromium same as webrtc jun9 contains the following changes in chromium: https://chromium.googlesource.com/chromium/src/+log/aa5126ff..7fa6701b some trybot scripts failing. build bots green before roll. Will see if commit causes build bot failure. TBR=kjellander@chromium.org BUG=libyuv:626 Review URL: https://codereview.chromium.org/2146073004 . --- .gn | 1 + DEPS | 2 +- libyuv.gyp | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gn b/.gn index 63dad32d5..5f2d3b69f 100644 --- a/.gn +++ b/.gn @@ -40,6 +40,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 8409485e0..25f6a3218 100644 --- a/DEPS +++ b/DEPS @@ -7,7 +7,7 @@ vars = { # Roll the Chromium Git hash to pick up newer versions of all the # dependencies and tools linked to in setup_links.py. - 'chromium_revision': 'aa5126ff66379a9060e87b010135f1aee7fc1ab2', + 'chromium_revision': '7fa6701bc5183bd5a73203d4fe1309f75ccfd5b4', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/libyuv.gyp b/libyuv.gyp index db4b54904..7fc08dc76 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -33,6 +33,10 @@ { 'build_neon': 1, }], + ['OS=="android" and target_arch=="mipsel"', { + # Linking fails with the gold linker: bugs.webrtc.org/5977. + 'linux_use_bundled_gold%': 0, + }], ], },