From f2bb57cfe34fac675691439b93421f1c210e9771 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 1 Dec 2014 13:11:38 -0800 Subject: [PATCH] Fix running the bionic benchmarks on the host. Bug: 18556607 Change-Id: I4e75bfcde788b43e1926be1b0146acf09b496390 --- benchmarks/Android.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index 00250a5c8..eb39a8590 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -63,13 +63,13 @@ NATIVE_SUFFIX=64 endif bionic-benchmarks-run-on-host: bionic-benchmarks $(TARGET_OUT_EXECUTABLES)/$(LINKER) $(TARGET_OUT_EXECUTABLES)/sh - if [ ! -d /system -o ! -d /system/bin ]; then \ - echo "Attempting to create /system/bin"; \ - sudo mkdir -p -m 0777 /system/bin; \ + if [ ! -d /system ]; then \ + echo "Attempting to create /system"; \ + sudo mkdir -p -m 0777 /system; \ fi mkdir -p $(TARGET_OUT_DATA)/local/tmp - cp $(TARGET_OUT_EXECUTABLES)/$(LINKER) /system/bin - cp $(TARGET_OUT_EXECUTABLES)/sh /system/bin + ln -fs `realpath $(TARGET_OUT)/bin` /system/ + ln -fs `realpath $(TARGET_OUT)/etc` /system/ ANDROID_DATA=$(TARGET_OUT_DATA) \ ANDROID_ROOT=$(TARGET_OUT) \ LD_LIBRARY_PATH=$(TARGET_OUT_SHARED_LIBRARIES) \