Put back path to Android MIPS gnu as for clang

build/common.gypi

 # Copyright (c) 2012 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 4208 matching lines @@
                       }, { # clang==0
                         'cflags': ['-mips32', '-Wa,-mips32', ],
                       }],
                     ],
                   }],
                   ['clang==1', {
                     'cflags!': [
                       # Clang does not support the following options.
                       '-finline-limit=64',
                     ],
-                    'cflags': [
-                      # TODO(gordanac) Enable integrated-as.
-                      '-no-integrated-as',
+                    # TODO(gordanac) Enable integrated-as.
+                    'cflags': [ '-no-integrated-as' ],

[Nico, 2015/12/04 19:30:19]

nit: Since you're touching this line anyways, maybe you could change the
spelling to -fno-integrated-as (does the same thing but is nicer since this is
really a feature flag and those usually start with -f)

[gordanac, 2015/12/04 19:47:31]

Done.

+                    'conditions': [
+                      ['OS=="android"', {
+                        'cflags': [
+                          # Else /usr/bin/as gets picked up.
+                          '-B<(android_toolchain)',
+                        ],
+                      }],
                     ],
                   }],
                   ['clang==1 and OS=="android"', {
                     'ldflags': [
                       # Let clang find the ld in the NDK.
                       '--gcc-toolchain=<(android_toolchain)/..',
                     ],
                   }],
                   ['mips_dsp_rev==1', {
                     'cflags': ['-mdsp'],
@@ skipping 2128 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }