Merge "Fix two mistakes in art script rewrite."

1 files changed, 4 insertions, 1 deletions

diff --git a/tools/art b/tools/art
index 23eb23b29f..7bd4c54a22 100644
--- a/tools/art
+++ b/tools/art
@@ -229,11 +229,14 @@ function extract_dex2oat_flags() {
         shift
         ;;
       -Ximage:*)
-        DEX2OAT_BOOTIMAGE=$1
+        DEX2OAT_BOOT_IMAGE=$1
         # Remove '-Ximage:' from the argument.
         DEX2OAT_BOOT_IMAGE=${DEX2OAT_BOOT_IMAGE##-Ximage:}
         ;;
       -cp)
+        # Reset any previously parsed classpath, just like dalvikvm
+        # only supports one -cp argument.
+        DEX2OAT_CLASSPATH=()
         # TODO: support -classpath and CLASSPATH
         local oifs=$IFS
         IFS=':'