commit 5c0c743c30975f69d2c8fa642925bd09929ae21d
author Calin Juravle <calin@google.com> Thu May 11 22:33:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 11 22:33:07 2017 +0000
tree 809b8705b2fb2055c166f8ea608947f934748f91
parent 4d22fb122a25a710358beb23af43bf3b288e6ef7
parent 3dff0d30fd5a5af1f18dee4e0875c719ec057321

Merge "Clear odex/vdex/art file before running run-test" am: 0af0ec2b59 am: 0998c444ff
am: 3dff0d30fd

Change-Id: Id64abd84a6ab1af8ffc145a78d021a6e28095e90

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index c6ef8ed..fd8ad19 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -616,6 +616,8 @@
     vdex_cmdline="${dex2oat_cmdline} ${VDEX_FILTER} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex --output-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex"
   elif [ "$TEST_VDEX" = "y" ]; then
     vdex_cmdline="${dex2oat_cmdline} ${VDEX_FILTER} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex"
+  elif [ "$PROFILE" = "y" ] || [ "$RANDOM_PROFILE" = "y" ]; then
+    vdex_cmdline="${dex2oat_cmdline} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex --output-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex"
   fi
 fi