From 68e25eb5bf2d6e4a253f0627a650e8b7419ad043 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 29 Oct 2014 23:02:11 +0000 Subject: [PATCH] Fix combination of prebuild/no-image. Prebuild should always have an image. It's running the test that should not. Change-Id: I659514fba053c19edf13384ce061497d9b3a9e27 --- test/etc/run-test-jar | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 9b1af7073..39f28c877 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -210,10 +210,8 @@ fi if [ "$HAVE_IMAGE" = "n" ]; then DALVIKVM_BOOT_OPT="-Ximage:/system/non-existant/core.art" - DEX2OAT_BOOT_OPT="--boot-image=/system/non-existant/core.art" else DALVIKVM_BOOT_OPT="-Ximage:${BOOT_IMAGE}" - DEX2OAT_BOOT_OPT="--boot-image=${BOOT_IMAGE}" fi @@ -272,7 +270,7 @@ mkdir_cmdline="mkdir -p ${DEX_LOCATION}/dalvik-cache/$ISA" if [ "$PREBUILD" = "y" ]; then dex2oat_cmdline="$INVOKE_WITH $ANDROID_ROOT/bin/dex2oatd \ $COMPILE_FLAGS \ - $DEX2OAT_BOOT_OPT \ + --boot-image=${BOOT_IMAGE} \ --dex-file=$DEX_LOCATION/$TEST_NAME.jar \ --oat-file=$DEX_LOCATION/dalvik-cache/$ISA/$(echo $DEX_LOCATION/$TEST_NAME.jar/classes.dex | cut -d/ -f 2- | sed "s:/:@:g") \ --instruction-set=$ISA" -- 2.11.0