diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-17 00:09:24 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-17 00:09:24 +0000 |
| commit | a95b62a8c2bc4cf5e95857fd59c70cb166f71ed4 (patch) | |
| tree | a64a6da79ff33aa225c206c410342a1ab6292935 | |
| parent | ea552bcca3ba6954b079fd246ae0a13557ea1c9e (diff) | |
| parent | 7c7cae75a80eece7cf009ea12da644ea7c893c1d (diff) | |
| download | art-android11-qpr3-s1-release.tar.gz | |
Merge cherrypicks of [14217257, 14217258, 14217339, 14217529, 14217566, 14214972, 14217508, 14216278, 14216279, 14217530, 14217281, 14215011] into rvc-qpr3-releaseandroid-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-release
Change-Id: I9ab828d79dd609f34af2143f906d67160e918337
| -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 |