commit 1902c79d11855eea0a8809b468f1a40053fa6262
author Ethan Yonker <dees_troy@teamw.in> Wed Dec 03 16:48:36 2014 -0600
committer Dees Troy <dees_troy@teamw.in> Tue Dec 09 04:32:34 2014 +0100
tree 7842a8ab225162029730f147dfb6ec267980a3be
parent 7cb4c3322b3a282e63e77b0d2205fd2e51b8b932

Use linker64 on AArch64

Patch Set 3: Combine into one sed - by bigbiff

Change-Id: Ice3147fae76575f6e09c7df201bcd3f949aa24ea

prebuilt/Android.mk

diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 58f3d4c..c69e07c 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -30,6 +30,9 @@
 RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/mke2fs
 RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/tune2fs
 RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/linker
+ifeq ($(TARGET_ARCH), arm64)
+    RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/linker64
+endif
 #RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/twrpmtp
 RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libc.so
 RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libcutils.so

prebuilt/relink.sh

diff --git a/prebuilt/relink.sh b/prebuilt/relink.sh
index 4e9445a..48be3fc 100755
--- a/prebuilt/relink.sh
+++ b/prebuilt/relink.sh
@@ -11,7 +11,7 @@
       cp -f -p $src $dst
     fi
 
-    sed "s|/system/bin/linker\x0|/sbin/linker\x0\x0\x0\x0\x0\x0\x0|g" $src | sed "s|/system/bin/sh\x0|/sbin/sh\x0\x0\x0\x0\x0\x0\x0|g" > $dst
+    sed "s|/system/bin/linker64\x0|/sbin/linker64\x0\x0\x0\x0\x0\x0\x0|g" $src | sed "s|/system/bin/linker\x0|/sbin/linker\x0\x0\x0\x0\x0\x0\x0|g" | sed "s|/system/bin/sh\x0|/sbin/sh\x0\x0\x0\x0\x0\x0\x0|g" > $dst
 
     if [ $1 == $(dirname $2) ]; then
       rm -f $src