commit 904667a58fa38437d1be6907beb3fb76d1982e0b
author Brian Carlstrom <bdc@google.com> Sat Mar 10 23:43:07 2012 -0800
committer Brian Carlstrom <bdc@google.com> Sat Mar 10 23:43:10 2012 -0800
tree 4bddc18023c6d53509464af2914232963b48dd82
parent 5cb71bb4437db51f415e57e6002ba1ef023e7de1

Do not generate run-test out files in $ANDROID_PRODUCT_OUT

If run-test leaves cruft in $ANDROID_PRODUCT_OUT, flashall -w will
make the files on the device owned by the system user. This will cause
run-test 071-dexfile to fail when run as root.

Change-Id: I071a1d52cbbefd0e75556706b473260cb6832fd4

test/etc/default-build

diff --git a/test/etc/default-build b/test/etc/default-build
index 308a49f..3e5ccd3 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -25,9 +25,8 @@
 fi
 
 dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes
-mkdir -p ${ANDROID_PRODUCT_OUT}/data/run-test
-zip ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar classes.dex
-dex2oatd --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar --dex-location=/data/run-test/$TEST_NAME.jar --oat-file=${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar.oat
+zip $TEST_NAME.jar classes.dex
+dex2oatd --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=$TEST_NAME.jar --dex-location=/data/run-test/$TEST_NAME.jar --oat-file=$TEST_NAME.jar.oat
 
 if [ -r src-ex ]; then
     mkdir classes-ex
@@ -37,9 +36,8 @@
     # quick shuffle so that the stored name is "classes.dex"
     mv classes.dex classes-1.dex
     mv classes-ex.dex classes.dex
-    mkdir -p ${ANDROID_PRODUCT_OUT}/data/run-test
-    zip ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME-ex.jar classes.dex
-    dex2oatd --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME-ex.jar --dex-location=/data/run-test/$TEST_NAME-ex.jar --oat-file=${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME-ex.jar.oat
+    zip $TEST_NAME-ex.jar classes.dex
+    dex2oatd --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=$TEST_NAME-ex.jar --dex-location=/data/run-test/$TEST_NAME-ex.jar --oat-file=$TEST_NAME-ex.jar.oat
     mv classes.dex classes-ex.dex
     mv classes-1.dex classes.dex
 fi