Merge changes Id2a4db5a,I5e71b85d,I70f76ba7,I4d19cc10,I231178e7
am: f88e73f246
Change-Id: I25c5be0129b9071e7bb976cc872cf0dc8b7d4093
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index ede485a..ca7db48 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -654,6 +654,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