commit e919b281499121f9b64231b40a444462278ca1c8
author Mathieu Chartier <mathieuc@google.com> Thu May 18 16:57:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 18 16:57:05 2017 +0000
tree cfb3a7e55bec0569017f3c60f5895d979600881d
parent b9dd788821e47d87056eca0373ab0902f107150d
parent 3ceb2583c6213e1438ce80baafce121a9c9fdf8a

Merge "Use GC critical section for profile saver" am: ff120c2ad8 am: 2d582600da
am: 3ceb2583c6

Change-Id: I55ffc52b317a94b800de0107cd0c6eef118fc328

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