summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
author Dave Allison <dallison@google.com> 2014-07-10 01:55:25 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-07-09 14:42:04 +0000
commit672f8367f74e5db7d26714cd6fa1a13fa2a6c59f (patch)
tree4becd76b50de9b80dd1fb411a1891bacbe4c77c3 /test
parent4770a2e6d56398a6b4398fcce14fea43394e0d1b (diff)
parent3d14eb620716e92c21c4d2c2d11a95be53319791 (diff)
Merge "Revert "Add implicit null and stack checks for x86""
Diffstat (limited to 'test')
-rw-r--r--test/Android.oat.mk1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/Android.oat.mk b/test/Android.oat.mk
index efd17937d4..fec2540e9c 100644
--- a/test/Android.oat.mk
+++ b/test/Android.oat.mk
@@ -203,7 +203,6 @@ $(3): $$(ART_TEST_HOST_OAT_$(1)_DEX) $(ART_TEST_HOST_OAT_DEPENDENCIES)
ANDROID_ROOT=$(HOST_OUT) \
ANDROID_LOG_TAGS='*:d' \
LD_LIBRARY_PATH=$$($(2)ART_HOST_OUT_SHARED_LIBRARIES) \
- LD_PRELOAD=libsigchain$$(ART_HOST_SHLIB_EXTENSION) \
$(HOST_OUT_EXECUTABLES)/dalvikvm$$($(2)ART_PHONY_TEST_HOST_SUFFIX) $(DALVIKVM_FLAGS) $(5) \
-XXlib:libartd$(HOST_SHLIB_SUFFIX) -Ximage:$$(HOST_CORE_IMG_LOCATION) \
-classpath $(ART_HOST_TEST_DIR)/android-data-$$@/oat-test-dex-$(1).jar \