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
diff --git a/test/022-interface/build b/test/022-interface/build
index 43b1cc9..24b32bb 100644
--- a/test/022-interface/build
+++ b/test/022-interface/build
@@ -20,6 +20,5 @@
# 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