From acb8085678a241dd7e29a48f30845105e1f92d4d Mon Sep 17 00:00:00 2001
From: "kjellander@webrtc.org" <kjellander@webrtc.org>
Date: Sun, 25 Jan 2015 19:17:56 +0000
Subject: [PATCH] Roll chromium_revision c086b4e..4664fe0 (312108:312733)

Mainly to pick up the MIPS changes in
https://codereview.chromium.org/843563002/
for which the changes in
https://webrtc-codereview.appspot.com/41399004/
are included in this CL.

Relevant changes:
* src/third_party/android_tools: 56b3d3e..aaeda3d
* src/third_party/boringssl/src: ca9a538..5fa3eba
* src/third_party/libvpx: 4f9bd1b..8dc6ea9
* src/third_party/openmax_dl: 1a4171c..8f7bf0b
* src/tools/gyp: 194ec65..adb7d24
* src/tools/swarming_client: 0a795bd..e98dde9
Details: https://chromium.googlesource.com/chromium/src/+/c086b4e..4664fe0/DEPS

Clang version was not updated in this roll.

BUG=4214, 4222
TBR=marpan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/33059004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8145 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 DEPS                    | 2 +-
 webrtc/BUILD.gn         | 3 +--
 webrtc/build/webrtc.gni | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/DEPS b/DEPS
index 338c509faf..135707a845 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': 'c086b4e24d6c6649f99743e46df87f7761dd31d1',
+  'chromium_revision': '4664fe0d123f948bafa7b942717fc5847e61971c',
 }
 
 # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 2978b56fff..fdcfdaad23 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -8,7 +8,6 @@
 
 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330.
 
-import("//build/config/arm.gni")
 import("//build/config/crypto.gni")
 import("//build/config/linux/pkg_config.gni")
 import("build/webrtc.gni")
@@ -150,7 +149,7 @@ config("common_config") {
     } else {
       cflags += [ "-msoft-float" ]
     }
-    if (mips_arch_variant == "mips32r2") {
+    if (mips_arch_variant == "r2") {
       defines += [ "MIPS32_R2_LE" ]
       cflags += [ "-mips32r2" ]
       cflags_cc += [ "-mips32r2" ]
diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni
index 8e489a3794..6459dae0ae 100644
--- a/webrtc/build/webrtc.gni
+++ b/webrtc/build/webrtc.gni
@@ -7,6 +7,7 @@
 # be found in the AUTHORS file in the root of the source tree.
 
 import("//build/config/arm.gni")
+import("//build/config/mips.gni")
 
 declare_args() {
   # Assume Chromium build for now, since that's the priority case for getting GN
@@ -53,9 +54,8 @@ declare_args() {
   # Enable to use the Mozilla internal settings.
   build_with_mozilla = false
 
-  # Define MIPS architecture variant, MIPS DSP variant and MIPS FPU
-  # This may be subject to change in accordance to Chromium's MIPS flags
-  mips_arch_variant = "mips32r1"
+  # Define MIPS DSP variant and MIPS FPU.
+  # This may be subject to change in accordance to Chromium's MIPS flags.
   mips_dsp_rev = 0
   mips_fpu = true