am 46b99841: am bfeef2d3: Merge "Use ln(1) rather than cp(1) to set up host /system for testing."

* commit '46b998415561aadb8b47c61b7892e85a81b13de5':
  Use ln(1) rather than cp(1) to set up host /system for testing.
This commit is contained in:
Elliott Hughes 2014-10-09 12:44:32 +00:00 committed by Android Git Automerger
commit fad6661ad9

View File

@ -401,8 +401,8 @@ bionic-unit-tests-run-on-host: bionic-unit-tests $(TARGET_OUT_EXECUTABLES)/$(LIN
sudo mkdir -p -m 0777 /system/bin; \
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_EXECUTABLES)/$(LINKER)` /system/bin
ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/sh` /system/bin
ANDROID_DATA=$(TARGET_OUT_DATA) \
ANDROID_ROOT=$(TARGET_OUT) \
LD_LIBRARY_PATH=$(TARGET_OUT_SHARED_LIBRARIES) \
@ -417,8 +417,8 @@ bionic-unit-tests-run-on-host32: bionic-unit-tests_32 $(TARGET_OUT_EXECUTABLES)/
sudo mkdir -p -m 0777 /system/bin; \
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_EXECUTABLES)/linker` /system/bin
ln -fs `realpath $(TARGET_OUT_EXECUTABLES)/sh` /system/bin
ANDROID_DATA=$(TARGET_OUT_DATA) \
ANDROID_ROOT=$(TARGET_OUT) \
LD_LIBRARY_PATH=$(2ND_TARGET_OUT_SHARED_LIBRARIES) \