👕 Fix Android arm64 executables not linking in component builds

build/config/android/BUILD.gn

Index: build/config/android/BUILD.gn
diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
index ec3b531171d5fc17630fb763b2abef88804362a6..b44a855098ed53948d5b9d9c72760e8fedb6b7c4 100644
--- a/build/config/android/BUILD.gn
+++ b/build/config/android/BUILD.gn
@@ -8,6 +8,8 @@ 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.
@@ -43,7 +45,7 @@ config("compiler") {
   }
 
   # Use gold for Android for most CPU architectures.
-  if (current_cpu == "x86" || current_cpu == "x64" || current_cpu == "arm") {
+  if (use_gold) {
     ldflags += [ "-fuse-ld=gold" ]
     if (is_clang) {
       # Let clang find the ld.gold in the NDK.
@@ -179,6 +181,12 @@ config("executable_config") {
   cflags = [ "-fPIE" ]
   asmflags = [ "-fPIE" ]
   ldflags = [ "-pie" ]
+
+  if (!use_gold) {

[jbudorick, 2016/05/02 17:18:05]

Why is this only in executable_config? Do we need it for building shared
libraries, too? Why doesn't this belong up in the compiler config?

[agrieve, 2016/05/02 17:20:33]

For the most part, I don't know, but it doesn't seem to be needed there.

[jbudorick, 2016/05/02 17:40:32]

I'm reading this as "the build completed locally this way." Is that correct?

+    # 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") {