👻 Merge android's use_gold settings with the main use_gold GN arg logic

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)
 
-use_gold = current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm"
-
 # This is included by reference in the //build/config/compiler config that
 # is applied to all targets. It is here to separate out the logic that is
 # Android-only.
 config("compiler") {
   cflags = [
     "-ffunction-sections",
     "-fno-short-enums",
   ]
   defines = [
     "ANDROID",
 
     # The NDK has these things, but doesn't define the constants to say that it
     # does. Define them here instead.
     "HAVE_SYS_UIO_H",
   ]
-  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)
     assert(rebased_android_toolchain_root != "")  # Mark as used.
     if (current_cpu == "mipsel") {
       cflags += [
         # TODO(gordanac) Enable integrated-as.
         "-no-integrated-as",
         "-B${rebased_android_toolchain_root}/bin",  # Else /usr/bin/as gets picked up.
       ]
     }
+  } else {
+    # Clang doesn't support these flags.
+    cflags += [ "-finline-limit=64" ]
   }
 
-  # Use gold for Android for most CPU architectures.
-  if (use_gold) {
-    ldflags += [ "-fuse-ld=gold" ]
-    if (is_clang) {
-      # Let clang find the ld.gold in the NDK.
-      ldflags += [ "--gcc-toolchain=$rebased_android_toolchain_root" ]
-    }
-
-    # Use -mstackrealign due to a bug on ia32 Jelly Bean.
-    # See crbug.com/521527
-    if (current_cpu == "x86") {
-      cflags += [ "-mstackrealign" ]
-    }
-  }
-
-  if (current_cpu == "mipsel" && is_clang) {
-    # Let clang find the ld.bfd in the NDK.
-    ldflags += [ "--gcc-toolchain=$rebased_android_toolchain_root" ]
-  }
-
-  ldflags += [
+  ldflags = [
     "-Wl,--build-id=sha1",
     "-Wl,--no-undefined",
 
     # Don't allow visible symbols from libgcc or libc++ to be
     # re-exported.
     "-Wl,--exclude-libs=libgcc.a",
     "-Wl,--exclude-libs=libc++_static.a",
 
     # Don't allow visible symbols from libraries that contain
     # assembly code with symbols that aren't hidden properly.
     # http://crbug.com/448386
     "-Wl,--exclude-libs=libvpx_assembly_arm.a",
   ]
-  if (current_cpu == "arm" && !use_order_profiling) {
-    ldflags += [
-      # Enable identical code folding to reduce size.
-      "-Wl,--icf=all",
-    ]
-  }
 
   if (is_clang) {
     if (current_cpu == "arm") {
       abi_target = "arm-linux-androideabi"
     } else if (current_cpu == "x86") {
       abi_target = "i686-linux-androideabi"
     } else if (current_cpu == "arm64") {
       # Place holder for arm64 support, not tested.
       # TODO: Enable clang support for Android Arm64. http://crbug.com/539781
       abi_target = "aarch64-linux-androideabi"
@@ skipping 77 matching lines @@
   # issues with libc++ (crbug.com/456380).
   if (current_cpu != "mipsel" && current_cpu != "mips64el") {
     ldflags += [ "-Wl,--warn-shared-textrel" ]
   }
 }
 
 config("executable_config") {
   cflags = [ "-fPIE" ]
   asmflags = [ "-fPIE" ]
   ldflags = [ "-pie" ]
-
-  if (!use_gold) {
-    # ld needs help finding libraries when linking.
-    _rebased_sysroot = rebase_path(sysroot, root_build_dir)
-    ldflags += [ "-Wl,-rpath-link=.:$_rebased_sysroot/usr/lib" ]
-  }
 }
 
 config("hide_native_jni_exports") {
   ldflags = [ "-Wl,--version-script=" +
               rebase_path("//build/android/android_no_jni_exports.lst") ]
 }
 
 # Instrumentation -------------------------------------------------------------
 #
 # The BUILDCONFIG file sets the "default_cygprofile_instrumentation" config on
@@ skipping 22 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",
     ]
   }
 }
 
 config("no_cygprofile_instrumentation") {
 }