Move to new art dalvikvm

Change-Id: Ib04bc9853b7084965fa0c9899c3e5f5ac42d4ce7
diff --git a/tools/art b/tools/art
index 4d5fc1f..0a6c941 100755
--- a/tools/art
+++ b/tools/art
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-oatexec=oatexec
+lib=-XXlib:libart.so
 invoke_with=
 
 while true; do
@@ -23,7 +23,7 @@
     invoke_with="$1"
     shift
   elif [ "$1" = "-d" ]; then
-    oatexec="oatexecd"
+    lib="-XXlib:libartd.so"
     shift
   elif expr "$1" : "--" >/dev/null 2>&1; then
     echo "unknown option: $1" 1>&2
@@ -39,7 +39,7 @@
 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 \
+  exec $invoke_with $ANDROID_HOST_OUT/bin/dalvikvm $lib \
     -Xbootclasspath:$ANDROID_HOST_OUT/core-hostdex.jar \
     -Ximage:$ANDROID_HOST_OUT/framework/core.art \
      "$@"