commit 2b7c63dfe6fec57695c7bef55eb4b40e8c8efb4c
author Andreas Gampe <agampe@google.com> Tue May 30 22:41:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 30 22:41:05 2017 +0000
tree bd84d40bfb4bcf9263fbe4d8e24090d3b2806317
parent 3c137f6c0e9dcb9b36241a609acc4257020909f6
parent ceba02d8f625872a99d7667e750464b0ecd3014f

Merge changes I1f50e09d,I8b2bb87a am: 1051fa2d74 am: 22359a67a7
am: ceba02d8f6

Change-Id: I4f139aa96c50addffb501f7a4bd34ef8bd671215

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index ca52a99..5d5d165 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