commit 722739108a9a1b30cbcb8285ce0b76762b356fb3
author kjellander@webrtc.org <kjellander@webrtc.org> Mon Feb 23 19:08:31 2015
committer kjellander@webrtc.org <kjellander@webrtc.org> Mon Feb 23 19:09:22 2015
tree b8d9d30f1d3cd21c4cabd0576341359269789e95
parent b28474c7a0356f21b374f43a51602ed10f143bf4

Roll chromium_revision b0c3ed3..2c3ffb2 (316737:317530)

Includes GN changes from
https://webrtc-codereview.appspot.com/39249004/

Android changes for JNI were required due to
https://codereview.chromium.org/843103003

Other relevant changes:
* src/buildtools: 5c5e924..93b3d0a
* src/third_party/boringssl/src: d306f16..b180ee9
* src/third_party/icu: 4e3266f..2081ee6
* src/third_party/libvpx: 5cdd302..33bbffe
* src/third_party/usrsctp/usrsctplib: 190c8cb..13718c7
* src/tools/gyp: 4d7c139..3464008
* src/tools/swarming_client: bdad118..1b7bfec
Details: https://chromium.googlesource.com/chromium/src/+/b0c3ed3..2c3ffb2/DEPS

Clang version was not updated in this roll.

R=dpranke@chromium.org, phoglund@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8466}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8466 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/common_audio/BUILD.gn

diff --git a/webrtc/common_audio/BUILD.gn b/webrtc/common_audio/BUILD.gn
index 4a21da0..d3eced6 100644
--- a/webrtc/common_audio/BUILD.gn
+++ b/webrtc/common_audio/BUILD.gn
@@ -110,7 +110,7 @@
     deps += [ "//third_party/openmax_dl/dl" ]
   }
 
-  if (cpu_arch == "arm") {
+  if (current_cpu == "arm") {
     sources += [
       "signal_processing/complex_bit_reverse_arm.S",
       "signal_processing/spl_sqrt_floor_arm.S",
@@ -124,7 +124,7 @@
     }
   }
 
-  if (cpu_arch == "mipsel") {
+  if (current_cpu == "mipsel") {
     sources += [
       "signal_processing/include/spl_inl_mips.h",
       "signal_processing/complex_bit_reverse_mips.c",
@@ -143,7 +143,7 @@
     sources += [ "signal_processing/complex_fft.c" ]
   }
 
-  if (cpu_arch != "arm" && cpu_arch != "mipsel") {
+  if (current_cpu != "arm" && current_cpu != "mipsel") {
     sources += [
       "signal_processing/complex_bit_reverse.c",
       "signal_processing/filter_ar_fast_q12.c",
@@ -170,12 +170,12 @@
     configs -= [ "//build/config/clang:find_bad_constructs" ]
   }
 
-  if (cpu_arch == "x86" || cpu_arch == "x64") {
+  if (current_cpu == "x86" || current_cpu == "x64") {
     deps += [ ":common_audio_sse2" ]
   }
 }
 
-if (cpu_arch == "x86" || cpu_arch == "x64") {
+if (current_cpu == "x86" || current_cpu == "x64") {
   source_set("common_audio_sse2") {
     sources = [
       "fir_filter_sse.cc",