3 files changed, 7 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 3433d093a..207ee16d9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -307,8 +307,6 @@ ifeq ($(PLATFORM_VERSION), 5.0.1)
     LOCAL_CFLAGS += -DANDROID_VERSION=5
 endif
 
-LOCAL_LDFLAGS += -Wl,-dynamic-linker,/sbin/linker
-
 LOCAL_ADDITIONAL_DEPENDENCIES := \
     dump_image \
     erase_image \
@@ -328,6 +326,9 @@ ifneq ($(TARGET_ARCH), arm64)
         dosfslabel \
         fsck_msdos_symlink \
         mkdosfs
+    LOCAL_LDFLAGS += -Wl,-dynamic-linker,/sbin/linker
+else
+    LOCAL_LDFLAGS += -Wl,-dynamic-linker,/sbin/linker64
 endif
 ifneq ($(TW_USE_TOOLBOX), true)
     LOCAL_ADDITIONAL_DEPENDENCIES += busybox_symlinks
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 58f3d4c51..c69e07c8f 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -30,6 +30,9 @@ RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/e2fsck
 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
diff --git a/prebuilt/relink.sh b/prebuilt/relink.sh
index 4e9445aeb..48be3fcb9 100755
--- a/prebuilt/relink.sh
+++ b/prebuilt/relink.sh
@@ -11,7 +11,7 @@ process_file()
       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