summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-02-19 10:50:50 -0800
committerElliott Hughes <enh@google.com>2013-02-19 10:50:50 -0800
commitaddf1a8da2ece5ee9d6747a176f960ab7291f718 (patch)
tree9806306981ca16bab1671feac53d6810af5b2fb2
parentabe640f873536f4f0b5953558c086fe82123e6ca (diff)
downloadart-addf1a8da2ece5ee9d6747a176f960ab7291f718.tar.gz
art-addf1a8da2ece5ee9d6747a176f960ab7291f718.tar.bz2
art-addf1a8da2ece5ee9d6747a176f960ab7291f718.zip
Fix the last failing host -Xint JDWP test.
There's a test that asserts that the bootclasspath is non-empty. Change-Id: I9cd93f658255361cdd9dd73e6ecda6da37219cb7
-rwxr-xr-xtools/art13
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/art b/tools/art
index 4f419b2ab..2a876a044 100755
--- a/tools/art
+++ b/tools/art
@@ -36,9 +36,10 @@ done
unset ANDROID_PRODUCT_OUT # avoid defaulting dex2oat --host-prefix to target output
mkdir -p /tmp/android-data/art-cache
cd $ANDROID_BUILD_TOP
-ANDROID_DATA=/tmp/android-data\
- ANDROID_ROOT=$ANDROID_HOST_OUT\
- LD_LIBRARY_PATH=$ANDROID_HOST_OUT/lib\
- exec $invoke_with $ANDROID_HOST_OUT/bin/$oatexec\
- -Ximage:$ANDROID_HOST_OUT/framework/core.art \
- "$@"
+ANDROID_DATA=/tmp/android-data \
+ ANDROID_ROOT=$ANDROID_HOST_OUT \
+ LD_LIBRARY_PATH=$ANDROID_HOST_OUT/lib \
+ exec $invoke_with $ANDROID_HOST_OUT/bin/$oatexec \
+ -Xbootclasspath:$ANDROID_HOST_OUT/core-hostdex.jar \
+ -Ximage:$ANDROID_HOST_OUT/framework/core.art \
+ "$@"