commit b9dd788821e47d87056eca0373ab0902f107150d
author Calin Juravle <calin@google.com> Thu May 18 16:56:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 18 16:56:34 2017 +0000
tree 6e1ec03a5d8f7e80183b97d1ce8576ad458bd4b9
parent 7398b2fc5c56cca4f9e1c0cd3fac363e5e164cd9
parent 07dd235206e0e7e83263f0b68bbe77a7dab99c00

Merge "Do not cache profiles in the ProfileSaver." am: ee810b376d am: df5b6a3fed
am: 07dd235206

Change-Id: I8c35bf0652f4043c23dbca3f682d23b72c7a0ace

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index a89fe5b..b722c68 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