Move art content to /data
oat tests, gtests, and run-test content to /data/art-test
boot.oat and boot.art to /data/art-cache
Change-Id: I68f9f6798bc4ea0596642ff5624f3e77dec6ccbe
diff --git a/test/056-const-string-jumbo/build b/test/056-const-string-jumbo/build
index fbd4116..d7a8268 100644
--- a/test/056-const-string-jumbo/build
+++ b/test/056-const-string-jumbo/build
@@ -44,10 +44,10 @@
dx -JXmx500m --debug --dex --no-optimize --positions=none --no-locals \
--dump-to=classes.lst --output=classes.dex classes
-zip ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar classes.dex
+zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
- --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar \
- --oat=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat \
+ --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art \
+ --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar \
+ --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat \
--host-prefix=${ANDROID_PRODUCT_OUT}
diff --git a/test/etc/default-build b/test/etc/default-build
index c3cdd79..0ac7fbf 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -26,12 +26,12 @@
dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex \
--dump-width=1000 classes
-zip ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar classes.dex
+zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
- --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar \
- --oat=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat \
+ --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art \
+ --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar \
+ --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat \
--host-prefix=${ANDROID_PRODUCT_OUT}
if [ -r src-ex ]; then
@@ -43,13 +43,13 @@
# quick shuffle so that the stored name is "classes.dex"
mv classes.dex classes-1.dex
mv classes-ex.dex classes.dex
- zip ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar classes.dex
+ zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar classes.dex
mv classes.dex classes-ex.dex
mv classes-1.dex classes.dex
dex2oatd -Xms16m -Xmx16m \
- --boot-image=${ANDROID_PRODUCT_OUT}/system/framework/core.art \
- --dex-file=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar \
- --oat=${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.oat \
+ --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art \
+ --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar \
+ --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat \
--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 9b33924..c1d9250 100755
--- a/test/etc/push-and-run-test-jar
+++ b/test/etc/push-and-run-test-jar
@@ -85,19 +85,19 @@
msg "------------------------------"
if [ "$QUIET" = "n" ]; then
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar /system/framework
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat /system/framework
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.art /system/framework
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar /system/framework
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.oat /system/framework
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.art /system/framework
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar /system/framework
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat /data/art-test
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.art /data/art-test
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar /data/art-test
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat /data/art-test
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.art /data/art-test
else
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.jar /system/framework >/dev/null 2>&1
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.oat /system/framework >/dev/null 2>&1
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME.art /system/framework >/dev/null 2>&1
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.jar /system/framework >/dev/null 2>&1
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.oat /system/framework >/dev/null 2>&1
- adb push ${ANDROID_PRODUCT_OUT}/system/framework/$TEST_NAME-ex.art /system/framework >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar /data/art-test >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat /data/art-test >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.art /data/art-test >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar /data/art-test >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat /data/art-test >/dev/null 2>&1
+ adb push ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.art /data/art-test >/dev/null 2>&1
fi
if [ "$DEBUG" = "y" ]; then
@@ -114,8 +114,8 @@
adb shell cd /data \; dvz -classpath $TEST_NAME.jar Main "$@"
else
cmdline="cd /data; oatexecd \
- -Ximage:/system/framework/core.art \
- -cp /system/framework/$TEST_NAME.jar \
+ -Ximage:/data/art-test/core.art \
+ -cp /data/art-test/$TEST_NAME.jar \
Main"
#cmdline="cd /data; dalvikvm $DEX_VERIFY $DEX_OPTIMIZE $DEX_DEBUG \
# $GC_OPTS -cp test.jar -Xint:${INTERP} -ea Main"