generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am d0402acd: Merge "x86_64: Fix bionic tests build-and-run"

Browse Source 
* commit 'd0402acdc76e1ea412085b3b633f5ae798022350':
  x86_64: Fix bionic tests build-and-run
This commit is contained in:
Elliott Hughes 2013-10-18 15:09:12 -07:00 committed by Android Git Automerger
commit 63e118b7db
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/Android.mk
View File

@ -194,14 +194,19 @@ endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86) ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86)
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
ifeq ($(TARGET_ARCH),x86) ifeq ($(TARGET_ARCH),x86)
LINKER = linker
else
LINKER = linker64
endif
# gtest needs EXTERNAL_STORAGE for death test output. # gtest needs EXTERNAL_STORAGE for death test output.
# bionic itself should always work relative to ANDROID_DATA or ANDROID_ROOT. # 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 # We create /data/local/tmp to be as much like the regular target environment
# as possible. # 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 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 cp $(TARGET_OUT_EXECUTABLES)/sh /system/bin
ANDROID_DATA=$(TARGET_OUT_DATA) \ ANDROID_DATA=$(TARGET_OUT_DATA) \
ANDROID_ROOT=$(TARGET_OUT) \ ANDROID_ROOT=$(TARGET_OUT) \