From 1902c79d11855eea0a8809b468f1a40053fa6262 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Wed, 3 Dec 2014 16:48:36 -0600 Subject: Use linker64 on AArch64 Patch Set 3: Combine into one sed - by bigbiff Change-Id: Ice3147fae76575f6e09c7df201bcd3f949aa24ea --- Android.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Android.mk') 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 -- cgit v1.2.3