clang/arm: Push -no-integrated-as into the four targets that need it.

build/config/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 import("//build/config/sysroot.gni")
 
 assert(is_android)
 
@@ skipping 15 matching lines @@
   ]
   ldflags = []
 
   if (!is_clang) {
     # Clang doesn't support these flags.
     cflags += [ "-finline-limit=64" ]
   }
   if (is_clang) {
     rebased_android_toolchain_root =
         rebase_path(android_toolchain_root, root_build_dir)
-    if (current_cpu == "arm" || current_cpu == "mipsel") {
+    if (current_cpu == "mipsel") {

[hans, 2015/12/01 15:18:24]

Is the MIPS build gn only?

[Nico, 2015/12/01 15:21:37]

No, gyp has something like this somewhere too.

       cflags += [
-        # TODO(hans) Enable integrated-as (crbug.com/124610).
+        # TODO(gordanac) Enable integrated-as.com/124610).

[Johann, 2015/12/01 15:26:18]

Typo in the comment

[Nico, 2015/12/01 16:27:57]

Done.

         "-no-integrated-as",
         "-B${rebased_android_toolchain_root}/bin",  # Else /usr/bin/as gets picked up.
       ]
     }
   }
 
   # Use gold for Android for most CPU architectures.
   if (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm") {
     ldflags += [ "-fuse-ld=gold" ]
     if (is_clang) {
@@ skipping 182 matching lines @@
 
     # Avoid errors with current NDK:
     # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426:3: error: argument must be a constant"
     "-finstrument-functions-exclude-file-list=arm_neon.h,SaturatedArithmeticARM.h",
   ]
   defines = [ "CYGPROFILE_INSTRUMENTATION=1" ]
 }
 
 config("no_cygprofile_instrumentation") {
 }