From e497bc8b1a214c9291e9e9fa99576b14dc4cc910 Mon Sep 17 00:00:00 2001
From: Frank Barchard <fbarchard@google.com>
Date: Tue, 19 Jul 2016 11:28:25 -0700
Subject: [PATCH] Revert "roll chromium same as webrtc jun9"

This reverts commit a817c1524013e06a9175fcd8132bfb86836bcc33.

TBR=kjellander@chromium.org
BUG=libyuv:626, webrtc:5990

Review URL: https://codereview.chromium.org/2161923003 .
---
 .gn        | 1 -
 DEPS       | 2 +-
 libyuv.gyp | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gn b/.gn
index 5f2d3b69f..63dad32d5 100644
--- a/.gn
+++ b/.gn
@@ -40,7 +40,6 @@ 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 25f6a3218..8409485e0 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': '7fa6701bc5183bd5a73203d4fe1309f75ccfd5b4',
+  'chromium_revision': 'aa5126ff66379a9060e87b010135f1aee7fc1ab2',
 }
 
 # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
diff --git a/libyuv.gyp b/libyuv.gyp
index 7fc08dc76..db4b54904 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -33,10 +33,6 @@
        {
          'build_neon': 1,
        }],
-      ['OS=="android" and target_arch=="mipsel"', {
-        # Linking fails with the gold linker: bugs.webrtc.org/5977.
-        'linux_use_bundled_gold%': 0,
-      }],
     ],
   },