From 4f6a9762123126fcfbd2f1b52755565531d96c30 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Mon, 9 Mar 2015 13:58:54 -0500 Subject: Make TWRP compile for x86-64 CPU target Also add a short while loop to wait for fb0 to be created as was needed on the x86-64 target for the Android emulator. Change-Id: Ib1b87bea028ac3eac0541283334a0157cdfbce11 --- prebuilt/Android.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'prebuilt') diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk index 9ff304cd8..07e24e39e 100644 --- a/prebuilt/Android.mk +++ b/prebuilt/Android.mk @@ -26,7 +26,12 @@ RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/mkdosfs 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 +ifneq ($(TARGET_ARCH), x86_64) + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/linker +endif +ifeq ($(TARGET_ARCH), x86_64) + RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/linker64 +endif ifeq ($(TARGET_ARCH), arm64) RELINK_SOURCE_FILES += $(TARGET_OUT_EXECUTABLES)/linker64 endif -- cgit v1.2.3