Simplify command line arguments
Change-Id: I9d6902b0c447fd8fbe5600fd36139791b2ceefb7
diff --git a/test/003-omnibus-opcodes/build b/test/003-omnibus-opcodes/build
index bbd392f..c3af10c 100644
--- a/test/003-omnibus-opcodes/build
+++ b/test/003-omnibus-opcodes/build
@@ -26,10 +26,8 @@
zip ${ANDROID_PRODUCT_OUT}/system/framework/test.jar classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-dex-file=${ANDROID_PRODUCT_OUT}/system/framework/core.jar \
- --boot-oat=${ANDROID_PRODUCT_OUT}/system/framework/core.oat \
--boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
--dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test.jar \
--oat=${ANDROID_PRODUCT_OUT}/system/framework/test.oat \
--image=${ANDROID_PRODUCT_OUT}/system/framework/test.art \
- --strip-prefix=${ANDROID_PRODUCT_OUT}
+ --host-prefix=${ANDROID_PRODUCT_OUT}
diff --git a/test/023-many-interfaces/build b/test/023-many-interfaces/build
index 118e178..d0f376c 100644
--- a/test/023-many-interfaces/build
+++ b/test/023-many-interfaces/build
@@ -28,10 +28,8 @@
zip ${ANDROID_PRODUCT_OUT}/system/framework/test.jar classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-dex-file=${ANDROID_PRODUCT_OUT}/system/framework/core.jar \
- --boot-oat=${ANDROID_PRODUCT_OUT}/system/framework/core.oat \
--boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
--dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test.jar \
--oat=${ANDROID_PRODUCT_OUT}/system/framework/test.oat \
--image=${ANDROID_PRODUCT_OUT}/system/framework/test.art \
- --strip-prefix=${ANDROID_PRODUCT_OUT}
+ --host-prefix=${ANDROID_PRODUCT_OUT}
diff --git a/test/056-const-string-jumbo/build b/test/056-const-string-jumbo/build
index c39779b..a780c13 100644
--- a/test/056-const-string-jumbo/build
+++ b/test/056-const-string-jumbo/build
@@ -47,10 +47,8 @@
zip ${ANDROID_PRODUCT_OUT}/system/framework/test.jar classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-dex-file=${ANDROID_PRODUCT_OUT}/system/framework/core.jar \
- --boot-oat=${ANDROID_PRODUCT_OUT}/system/framework/core.oat \
--boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
--dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test.jar \
--oat=${ANDROID_PRODUCT_OUT}/system/framework/test.oat \
--image=${ANDROID_PRODUCT_OUT}/system/framework/test.art \
- --strip-prefix=${ANDROID_PRODUCT_OUT}
+ --host-prefix=${ANDROID_PRODUCT_OUT}
diff --git a/test/085-old-style-inner-class/build b/test/085-old-style-inner-class/build
index 5a1b04c..d3dc15f 100644
--- a/test/085-old-style-inner-class/build
+++ b/test/085-old-style-inner-class/build
@@ -29,10 +29,8 @@
zip ${ANDROID_PRODUCT_OUT}/system/framework/test.jar classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-dex-file=${ANDROID_PRODUCT_OUT}/system/framework/core.jar \
- --boot-oat=${ANDROID_PRODUCT_OUT}/system/framework/core.oat \
--boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
--dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test.jar \
--oat=${ANDROID_PRODUCT_OUT}/system/framework/test.oat \
--image=${ANDROID_PRODUCT_OUT}/system/framework/test.art \
- --strip-prefix=${ANDROID_PRODUCT_OUT}
+ --host-prefix=${ANDROID_PRODUCT_OUT}
diff --git a/test/etc/default-build b/test/etc/default-build
index e31e0ea..0ef8ba8 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -29,13 +29,11 @@
zip ${ANDROID_PRODUCT_OUT}/system/framework/test.jar classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-dex-file=${ANDROID_PRODUCT_OUT}/system/framework/core.jar \
- --boot-oat=${ANDROID_PRODUCT_OUT}/system/framework/core.oat \
--boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
--dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test.jar \
--oat=${ANDROID_PRODUCT_OUT}/system/framework/test.oat \
--image=${ANDROID_PRODUCT_OUT}/system/framework/test.art \
- --strip-prefix=${ANDROID_PRODUCT_OUT}
+ --host-prefix=${ANDROID_PRODUCT_OUT}
if [ -r src-ex ]; then
mkdir classes-ex
@@ -51,11 +49,9 @@
mv classes-1.dex classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-dex-file=${ANDROID_PRODUCT_OUT}/system/framework/core.jar \
- --boot-oat=${ANDROID_PRODUCT_OUT}/system/framework/core.oat \
--boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
--dex-file=${ANDROID_PRODUCT_OUT}/system/framework/test-ex.jar \
--oat=${ANDROID_PRODUCT_OUT}/system/framework/test-ex.oat \
--image=${ANDROID_PRODUCT_OUT}/system/framework/test-ex.art \
- --strip-prefix=${ANDROID_PRODUCT_OUT}
+ --host-prefix=${ANDROID_PRODUCT_OUT}
fi
diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar
index fd96b6b..0d4e3b4 100755
--- a/test/etc/push-and-run-test-jar
+++ b/test/etc/push-and-run-test-jar
@@ -135,11 +135,7 @@
adb shell cd /data \; dvz -classpath test.jar Main "$@"
else
cmdline="cd /data; oatexecd \
- -Xbootclasspath:/system/framework/core.jar \
- -Xbootoat:/system/framework/core.oat \
- -Xbootimage:/system/framework/core.art \
- -classpath /system/framework/test.jar \
- -Xoat:/system/framework/test.oat \
+ -Ximage:/system/framework/core.art \
-Ximage:/system/framework/test.art Main"
#cmdline="cd /data; dalvikvm $DEX_VERIFY $DEX_OPTIMIZE $DEX_DEBUG \
# $GC_OPTS -cp test.jar -Xint:${INTERP} -ea Main"