Use bundled gold by default when building for Android.

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 842 matching lines @@
           'enable_plugins%': 0,
         }, {
           'enable_plugins%': 1,
         }],
 
         # linux_use_bundled_gold: whether to use the gold linker binary checked
         # into third_party/binutils.  Force this off via GYP_DEFINES when you
         # are using a custom toolchain and need to control -B in ldflags.
         # Do not use 32-bit gold on 32-bit hosts as it runs out address space
         # for component=static_library builds.
-        ['OS=="linux" and (target_arch=="x64" or target_arch=="arm")', {
+        ['(OS=="linux" or OS=="android") and (target_arch=="x64" or target_arch=="arm")', {

[pasko, 2015/04/15 17:28:42]

since it is now also used for android, shall we rename it to just
'use_bundled_gold'?

[pcc1, 2015/04/15 21:19:01]

I'll see if I can rename it in a follow-up change in case the rename on its own
breaks anything.

           'linux_use_bundled_gold%': 1,
         }, {
           'linux_use_bundled_gold%': 0,
         }],
 
         # linux_use_bundled_binutils: whether to use the binary binutils
         # checked into third_party/binutils.  These are not multi-arch so cannot
         # be used except on x86 and x86-64 (the only two architectures which
         # are currently checke in).  Force this off via GYP_DEFINES when you
         # are using a custom toolchain and need to control -B in cflags.
@@ skipping 3136 matching lines @@
                           '-finline-limit=64',
                           '-fno-tree-sra',
                           '-fno-caller-saves',
                           '-Wno-psabi',
                         ],
                         'cflags': [
                           # TODO(hans) Enable integrated-as (crbug.com/124610).
                           '-no-integrated-as',
                           '-B<(android_toolchain)',  # Else /usr/bin/as gets picked up.
                         ],
+                      }],
+                      ['clang==1 and linux_use_bundled_gold==0', {
                         'ldflags': [
                           # Let clang find the ld.gold in the NDK.
                           '--gcc-toolchain=<(android_toolchain)/..',
                         ],
                       }],
                       ['asan==1', {
                         'cflags': [
                           '-marm', # Required for frame pointer based stack traces.
                         ],
                       }],
@@ skipping 2070 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',
   },
 }