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

7 files changed, 22 insertions, 29 deletions

diff --git a/test/003-omnibus-opcodes/build b/test/003-omnibus-opcodes/build
index 8dbfc90d3e..0671a32345 100644
--- a/test/003-omnibus-opcodes/build
+++ b/test/003-omnibus-opcodes/build
@@ -23,6 +23,5 @@ rm classes/UnresClass.class
 ${JAVAC} -d classes `find src2 -name '*.java'`
 
 dx -JXmx256m --debug --dex --dump-to=classes.lst --output=classes.dex 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
diff --git a/test/022-interface/build b/test/022-interface/build
index 43b1cc9890..24b32bb95f 100644
--- a/test/022-interface/build
+++ b/test/022-interface/build
@@ -20,6 +20,5 @@ set -e
 # Use classes that are compiled with ecj that exposes an invokeinterface
 # issue when interfaces override methods in Object
 dx --debug --dex --dump-to=classes.lst --output=classes.dex 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
diff --git a/test/023-many-interfaces/build b/test/023-many-interfaces/build
index 005390ec13..b28ab880fd 100644
--- a/test/023-many-interfaces/build
+++ b/test/023-many-interfaces/build
@@ -25,6 +25,5 @@ mkdir classes
 ${JAVAC} -d classes src/*.java
 
 dx --debug --dex --dump-to=classes.lst --output=classes.dex 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
diff --git a/test/056-const-string-jumbo/build b/test/056-const-string-jumbo/build
index 3e015d1fef..d0528312c8 100644
--- a/test/056-const-string-jumbo/build
+++ b/test/056-const-string-jumbo/build
@@ -43,6 +43,5 @@ mkdir classes
 ${JAVAC} -d classes src/*.java
 
 dx -JXmx500m --debug --dex --no-optimize --positions=none --no-locals --dump-to=classes.lst --output=classes.dex 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
diff --git a/test/085-old-style-inner-class/build b/test/085-old-style-inner-class/build
index 299fc027b6..daf615db25 100644
--- a/test/085-old-style-inner-class/build
+++ b/test/085-old-style-inner-class/build
@@ -25,6 +25,5 @@ ${JAVAC} -source 1.4 -target 1.4 -d classes `find src -name '*.java'`
 # Suppress stderr to keep the inner class warnings out of the expected output.
 dx --debug --dex --dump-to=classes.lst --output=classes.dex --dump-width=1000 classes 2>/dev/null
 
-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 2>/dev/null
+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
diff --git a/test/etc/default-build b/test/etc/default-build
index 308a49f6c0..3e5ccd3ca8 100755
--- a/test/etc/default-build
+++ b/test/etc/default-build
@@ -25,9 +25,8 @@ if [ -r src2 ]; then
 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 @@ if [ -r src-ex ]; then
     # 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
diff --git a/test/etc/push-and-run-test-jar b/test/etc/push-and-run-test-jar
index 324ac2ae26..e38c0cf3eb 100755
--- a/test/etc/push-and-run-test-jar
+++ b/test/etc/push-and-run-test-jar
@@ -92,16 +92,16 @@ msg "------------------------------"
 
 if [ "$QUIET" = "n" ]; then
   adb shell mkdir /data/run-test
-  adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar /data/run-test
-  adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar.oat /data/run-test
-  adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME-ex.jar /data/run-test
-  adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME-ex.jar.oat /data/run-test
+  adb push $TEST_NAME.jar /data/run-test
+  adb push $TEST_NAME.jar.oat /data/run-test
+  adb push $TEST_NAME-ex.jar /data/run-test
+  adb push $TEST_NAME-ex.jar.oat /data/run-test
 else
   adb shell mkdir /data/run-test >/dev/null 2>&1
-  adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar /data/run-test >/dev/null 2>&1
-  adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME.jar.oat /data/run-test >/dev/null 2>&1
-  adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME-ex.jar /data/run-test >/dev/null 2>&1
-  adb push ${ANDROID_PRODUCT_OUT}/data/run-test/$TEST_NAME-ex.jar.oat /data/run-test >/dev/null 2>&1
+  adb push $TEST_NAME.jar /data/run-test >/dev/null 2>&1
+  adb push $TEST_NAME.jar.oat /data/run-test >/dev/null 2>&1
+  adb push $TEST_NAME-ex.jar /data/run-test >/dev/null 2>&1
+  adb push $TEST_NAME-ex.jar.oat /data/run-test >/dev/null 2>&1
 fi
 
 if [ "$DEBUG" = "y" ]; then