Use bundled gold by default when building for Android.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 2452de4e01d2efdebabb121123982acd6b03daeb..e12f47460988726529875e8f7e1bb35701a61552 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -860,7 +860,7 @@
         # 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,
@@ -4017,6 +4017,8 @@
                           '-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)/..',