commit 91843c3006c5103ca1ecbe9b7ea2362220697699
author android-build-team Robot <android-build-team-robot@google.com> Thu Apr 15 04:23:57 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Apr 15 04:23:57 2021 +0000
tree 6ca317cb91bb9d623121f0d353e320b5c0607788
parent 13c82a6b362ef8d6512302034a70f311b5764d1e
parent 30da0ae75b5ac99e40e22bbf9fb45a8486efe004

Merge cherrypicks of [14193815] into security-aosp-rvc-release

Change-Id: I7503522ec252f23439ca1470cbfec41361298cd7

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 423f9b3..7d85b10 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -963,9 +963,9 @@
   elif [ "$TEST_VDEX" = "y" ]; then
     vdex_cmdline="${dex2oat_cmdline} ${VDEX_ARGS} --input-vdex=$DEX_LOCATION/oat/$ISA/$TEST_NAME.vdex"
   elif [ "$TEST_DM" = "y" ]; then
-    dex2oat_cmdline="${dex2oat_cmdline} --output-vdex=$DEX_LOCATION/oat/$ISA/primary.vdex"
+    dex2oat_cmdline="${dex2oat_cmdline} --copy-dex-files=false --output-vdex=$DEX_LOCATION/oat/$ISA/primary.vdex"
     dm_cmdline="zip -qj $DEX_LOCATION/oat/$ISA/$TEST_NAME.dm $DEX_LOCATION/oat/$ISA/primary.vdex"
-    vdex_cmdline="${dex2oat_cmdline} ${VDEX_ARGS} --copy-dex-files=false --dump-timings --dm-file=$DEX_LOCATION/oat/$ISA/$TEST_NAME.dm"
+    vdex_cmdline="${dex2oat_cmdline} ${VDEX_ARGS} --dump-timings --dm-file=$DEX_LOCATION/oat/$ISA/$TEST_NAME.dm"
   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