| Index: breakpad/BUILD.gn
 | 
| diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn
 | 
| index c9280812808d35336c8269d79c38a64e1a6d5631..66835e2bd4c65012f0120e652c4c4f9f0d0b7ede 100644
 | 
| --- a/breakpad/BUILD.gn
 | 
| +++ b/breakpad/BUILD.gn
 | 
| @@ -511,7 +511,7 @@ if (is_linux || is_android) {
 | 
|      configs += [ "//build/config/compiler:no_chromium_code" ]
 | 
|      public_configs = [ ":client_config" ]
 | 
|  
 | 
| -    if (cpu_arch == "arm" && is_chromeos) {
 | 
| +    if (current_cpu == "arm" && is_chromeos) {
 | 
|        # Avoid running out of registers in
 | 
|        # linux_syscall_support.h:sys_clone()'s inline assembly.
 | 
|        cflags = [ "-marm" ]
 | 
| @@ -630,7 +630,7 @@ if (is_linux) {
 | 
|  
 | 
|      include_dirs = [ "src" ]
 | 
|  
 | 
| -    if (cpu_arch == "mipsel" && is_android) {
 | 
| +    if (current_cpu == "mipsel" && is_android) {
 | 
|        include_dirs += [ "src/common/android/include" ]
 | 
|      }
 | 
|    }
 | 
| 
 |