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

build/config/gcc/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/compiler/compiler.gni")
 import("//build/config/sanitizers/sanitizers.gni")
-import("//build/config/sysroot.gni")
 import("//build/toolchain/toolchain.gni")
 
 # This config causes functions not to be automatically exported from shared
 # libraries. By default, all symbols are exported but this means there are
 # lots of exports that slow everything down. In general we explicitly mark
 # which functiosn we want to export from components.
 #
 # Some third_party code assumes all functions are exported so this is separated
 # into its own config so such libraries can remove this config to make symbols
 # public again.
@@ skipping 46 matching lines @@
     ldflags = [
       # Want to pass "\$". GN will re-escape as required for ninja.
       "-Wl,-rpath=\$ORIGIN/${rpath_link}",
       "-Wl,-rpath-link=${rpath_link}",
     ]
   }
 }
 
 # Settings for executables.
 config("executable_ldconfig") {
-  ldflags = []
   if (is_android) {
-    ldflags += [
+    ldflags = [
       "-Bdynamic",
       "-Wl,-z,nocopyreloc",
     ]
   } else {
     # See the rpath_for... config above for why this is necessary for component
     # builds. Sanitizers use a custom libc++ where this is also necessary.
     if (is_component_build || using_sanitizer) {
       configs = [ ":rpath_for_built_shared_libraries" ]
     }
-    if (current_cpu == "mipsel") {
-      ldflags += [ "-pie" ]
-    }
-  }
 
-  if (!is_android || !use_gold) {
     # Find the path containing shared libraries for this toolchain
     # relative to the build directory. ${root_out_dir} will be a
     # subdirectory of ${root_build_dir} when cross compiling.
-    _rpath_link = rebase_path(root_out_dir, root_build_dir)
+    rebased_out_dir = rebase_path(root_out_dir, root_build_dir)
     if (shlib_subdir != ".") {
-      _rpath_link += "/$shlib_subdir"
-    }
-    if (is_android) {
-      _rebased_sysroot = rebase_path(sysroot, root_build_dir)
-      _rpath_link += ":$_rebased_sysroot/usr/lib"
+      rpath_link = "${rebased_out_dir}/${shlib_subdir}"
+    } else {
+      rpath_link = rebased_out_dir
     }
 
-    ldflags += [
-      "-Wl,-rpath-link=$_rpath_link",
+    ldflags = [
+      "-Wl,-rpath-link=${rpath_link}",
 
       # TODO(GYP): Do we need a check on the binutils version here?
       #
       # Newer binutils don't set DT_RPATH unless you disable "new" dtags
       # and the new DT_RUNPATH doesn't work without --no-as-needed flag.
       "-Wl,--disable-new-dtags",
     ]
+    if (current_cpu == "mipsel") {
+      ldflags += [ "-pie" ]
+    }
   }
 }
 
 config("no_exceptions") {
   cflags_cc = [ "-fno-exceptions" ]
   cflags_objcc = cflags_cc
 }