commit 71438189306d914d784cc14c17cd64f95a559845
author Nicolas Geoffray <ngeoffray@google.com> Mon Aug 14 17:07:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 14 17:07:04 2017 +0000
tree 517c0b35f826c212e39e7cfaa0a05880bfb8e747
parent 1c351b62aa87596ccb6a6ef7f8bd9a55fda76d7d
parent d0176f5ddd07f5374322b1a1decd73f1e18166d7

Merge "Recover vdex regression on multidex."
am: d0176f5ddd

Change-Id: Idb8510c80d4e64082d6eb92d706fac58e3accd8c

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