commit 0511534dcbb00f26b2fd6209b1b60a3263bf042c
author Elliott Hughes <enh@google.com> Wed Oct 08 22:21:12 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 08 22:21:13 2014 +0000
tree f474e6ad3f20382e4de5ead04d70dfd7634c8267
parent bfeef2d3a903f161531ce5e45b2dd7d280e7f154
parent 75129ae9f3448905bf837d774a94ff973efd812e

Merge "Don't silently return EINVAL for a NULL sem_t*."

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 13d9038..f30a4a8 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -401,8 +401,8 @@
 	  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 @@
 	  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) \