commit feb66f44686a1c5a59f134e6820248ae942dfe32
author Nicolas Geoffray <ngeoffray@google.com> Thu May 04 13:45:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 04 13:45:06 2017 +0000
tree e4774d4d0a3f8c9500a4b53126d1e739b9479ea2
parent 6d3f65b52ed3c5b3f75c11d71f05149d8530285e
parent f97e2f7a1a1b4cea3d7802333186045f56850d75

Merge "Don't use free list LOS for --force-determinism." am: 9459127abb am: e51846563a
am: f97e2f7a1a

Change-Id: I95c296644d8b0e233183bf3b9bf64e17a78255bd

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index f750556..95908d9 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