commit 47a0d5a6f221066c3daf7f67f2122ed9c9cd217c
author Brian Carlstrom <bdc@google.com> Wed Oct 12 21:20:05 2011 -0700
committer Brian Carlstrom <bdc@google.com> Wed Oct 12 22:29:03 2011 -0700
tree a14a0bec52655075b5e14844328d0df440b616ec
parent 0839bdb71ba2dba8782f1813d7f7cee67a6f6a28

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

test/etc/default-build

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