commit 64c09b45d4d1ace9062db327a8363a5063f7bdbe
author Alex Light <allight@google.com> Thu Jul 27 23:50:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 27 23:50:53 2017 +0000
tree 9dd45993890413126d9f2d5607daf36c9d12dda4
parent e82e5dbb9a8f26e24bcc4a80189a7a3efd140df9
parent 2e53f8f69f8c4175085e337445ec42aa045a2f7f

Merge changes Iba7e9207,I11a4d3cb,I5a6746d3
am: 2e53f8f69f

Change-Id: Id9471983dc5ca43cb269f5ad59a580e8487ac3ad

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index e989e39..90e2600 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -658,6 +658,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