diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-18 17:59:07 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-18 17:59:07 +0000 |
| commit | 83cd633bec9586c44d214f01734d29de582882a3 (patch) | |
| tree | bb57e95010e8678e04dc044a1aa5ef80b9cd519e | |
| parent | b2993296f02ff6180b03a9a7354d0d8592ad76e7 (diff) | |
| parent | d9c4b8392470237722f92105d6c83dfbb08e5c07 (diff) | |
| download | art-android11-d2-release.tar.gz | |
Merge cherrypicks of [14230649, 14230629, 14230666, 14230630, 14230650, 14230611, 14230612] into rvc-d2-releaseandroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r45android-11.0.0_r44android-11.0.0_r42android-11.0.0_r41android11-d2-release
Change-Id: I222d56cf716d96cb6cc3f56b6229862dcc445154
| -rwxr-xr-x | test/etc/run-test-jar | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 423f9b3c01..7d85b102b5 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -963,9 +963,9 @@ if [ "$PREBUILD" = "y" ]; then 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 |