diff options
| author | David Brazdil <dbrazdil@google.com> | 2019-03-26 18:48:02 +0000 |
|---|---|---|
| committer | David Brazdil <dbrazdil@google.com> | 2019-04-11 20:46:22 +0000 |
| commit | cf403636080489a9f6271b2968dfd13fd85c4c80 (patch) | |
| tree | 9d7181984d4e6f0ba6944bda6c0bb513c204876a /test/008-exceptions/src/MultiDexBadInit.java | |
| parent | 2ab8904b465dfdb197ada63635e7c0ce4161c073 (diff) | |
Fix dex location of boot oat files during preopt
Dex location should reflect the path on target when preopting
on host. This previously did not hold and this patch fixes the
issue. Other paths remain the same as before. A DCHECK is added
to class linker to guarantee that -Xboot-classpath-locations is
not ignored.
Simultaneously it refactors the logic for resolving a relative
path to make it clearer which path is used for opening files
(dex file name) and which reflects the location on target (dex
location), as these differ when preopting.
The patch also adds a missing dex2oat dependency for oat_file_test.
Test: test-art-gtest-{host,target}-oat_file_test
Test: compiles, no DCHECK crashes
Bug: 129063331
Merged-In: I0629c7ee505b5fd50649800bb3e08efc1ee44102
Change-Id: I0629c7ee505b5fd50649800bb3e08efc1ee44102
(cherry picked from commit 3e8aae03770a4acceff2f7fb7d6db68e05602d84)
Diffstat (limited to 'test/008-exceptions/src/MultiDexBadInit.java')
0 files changed, 0 insertions, 0 deletions