We can no longer use "adb shell sh -c ..." internally
Change-Id: I9357ca59f73b79fa56686d221c83e024137eee35
diff --git a/Android.mk b/Android.mk
index 14cd0f3..86d29b2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -133,7 +133,6 @@
test-art-target-sync: $(TEST_ART_TARGET_SYNC_DEPS)
adb remount
adb sync
- adb shell mkdir -p $(ART_TARGET_TEST_DIR)
# Undefine variable now its served its purpose.
TEST_ART_TARGET_SYNC_DEPS :=
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 45bdbcb..3a887a2 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -205,7 +205,7 @@
$(hide) adb shell rm $(ART_TARGET_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@-$$$$PPID
$(hide) adb shell chmod 755 $(ART_TARGET_NATIVETEST_DIR)/$(TARGET_$(2)ARCH)/$(1)
$(hide) $$(call ART_TEST_SKIP,$$@) && \
- (adb shell sh -c "$(ART_TARGET_NATIVETEST_DIR)/$(TARGET_$(2)ARCH)/$(1) && touch $(ART_TARGET_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@-$$$$PPID" \
+ (adb shell "$(ART_TARGET_NATIVETEST_DIR)/$(TARGET_$(2)ARCH)/$(1) && touch $(ART_TARGET_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@-$$$$PPID" \
&& (adb pull $(ART_TARGET_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@-$$$$PPID /tmp/ \
&& $$(call ART_TEST_PASSED,$$@)) \
|| $$(call ART_TEST_FAILED,$$@))
diff --git a/test/Android.oat.mk b/test/Android.oat.mk
index b11efb4..da0ad8d 100644
--- a/test/Android.oat.mk
+++ b/test/Android.oat.mk
@@ -86,7 +86,7 @@
$(hide) adb shell touch $(ART_TARGET_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@-$(LOCAL_PID)
$(hide) adb shell rm $(ART_TARGET_TEST_DIR)/$(TARGET_$(2)ARCH)/$$@-$(LOCAL_PID)
$(hide) $$(call ART_TEST_SKIP,$$@) && \
- adb shell sh -c "/system/bin/dalvikvm$($(2)ART_PHONY_TEST_TARGET_SUFFIX) \
+ adb shell "/system/bin/dalvikvm$($(2)ART_PHONY_TEST_TARGET_SUFFIX) \
$(DALVIKVM_FLAGS) $(4) -XXlib:libartd.so -Ximage:$(ART_TARGET_TEST_DIR)/core.art \
-classpath $(ART_TARGET_TEST_DIR)/art-oat-test-$(1).jar \
-Djava.library.path=$(ART_TARGET_TEST_DIR)/$(TARGET_$(2)ARCH) $(1) \
