commit 6ef827a33b04fd5413d2ad88fd4599ca1920c824
author Brian Carlstrom <bdc@google.com> Sun Dec 11 14:57:47 2011 -0800
committer Brian Carlstrom <bdc@google.com> Mon Dec 12 11:20:06 2011 -0800
tree 77406068cca6949921ae61e07b8f933e107b5947
parent 996a72b3b6149abbff1a5bddf2d6af6a77d3082f

Revert dex2oat file locking

Effectively "git revert 234da578a2d91ed7f2ef47b2ec23fb0033e2746b"

Changed run-test to do dex2oat on the host to eliminate original motivation for dex2oat locking

Change-Id: I58d64f9b2ad7cf137df865945dd31361ca57f675

test/etc/default-build

diff --git a/test/etc/default-build b/test/etc/default-build
index e71db2a..1ab43af 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -24,20 +24,20 @@
     ${JAVAC} -d classes `find src2 -name '*.java'`
 fi
 
-dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex \
-    --dump-width=1000 classes
+dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes
 zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex
+dex2oat --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat
 
 if [ -r src-ex ]; then
     mkdir classes-ex
     ${JAVAC} -d classes-ex -cp classes `find src-ex -name '*.java'`
-    dx -JXmx256m --debug --dex --dump-to=classes-ex.lst \
-        --output=classes-ex.dex --dump-width=1000 classes-ex
+    dx -JXmx256m --debug --dex --dump-to=classes-ex.lst --output=classes-ex.dex --dump-width=1000 classes-ex
 
     # 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}/data/art-test/$TEST_NAME-ex.jar classes.dex
+    dex2oat --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.jar --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME-ex.oat
     mv classes.dex classes-ex.dex
     mv classes-1.dex classes.dex
 fi