From 17558dec7fc60775c940be0e494b42829f35e0b1 Mon Sep 17 00:00:00 2001 From: Pavel Chupin Date: Thu, 17 Oct 2013 14:41:34 +0400 Subject: [PATCH] x86_64: Fix bionic tests build-and-run Change-Id: Iab48362893a212afbcbc362fdfaff5bfa5b55259 Signed-off-by: Pavel Chupin --- tests/Android.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/Android.mk b/tests/Android.mk index 39c28a41d..5cc2d286a 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -194,14 +194,19 @@ endif # ----------------------------------------------------------------------------- ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86) +ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) ifeq ($(TARGET_ARCH),x86) +LINKER = linker +else +LINKER = linker64 +endif # gtest needs EXTERNAL_STORAGE for death test output. # bionic itself should always work relative to ANDROID_DATA or ANDROID_ROOT. # We create /data/local/tmp to be as much like the regular target environment # as possible. -bionic-unit-tests-run-on-host: bionic-unit-tests $(TARGET_OUT_EXECUTABLES)/linker +bionic-unit-tests-run-on-host: bionic-unit-tests $(TARGET_OUT_EXECUTABLES)/$(LINKER) $(TARGET_OUT_EXECUTABLES)/sh mkdir -p $(TARGET_OUT_DATA)/local/tmp - cp $(TARGET_OUT_EXECUTABLES)/linker /system/bin + cp $(TARGET_OUT_EXECUTABLES)/$(LINKER) /system/bin cp $(TARGET_OUT_EXECUTABLES)/sh /system/bin ANDROID_DATA=$(TARGET_OUT_DATA) \ ANDROID_ROOT=$(TARGET_OUT) \