summaryrefslogtreecommitdiff
path: root/test/MultiDex
diff options
context:
space:
mode:
authorDavid Brazdil <dbrazdil@google.com>2019-03-26 18:48:02 +0000
committerDavid Brazdil <dbrazdil@google.com>2019-04-11 06:57:08 +0000
commit3e8aae03770a4acceff2f7fb7d6db68e05602d84 (patch)
tree297b7f7cfeb82f352da84333f7fd584b8d0f8718 /test/MultiDex
parent40594870058427d6d1090f18c216f9dd155421e2 (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 Change-Id: I0629c7ee505b5fd50649800bb3e08efc1ee44102
Diffstat (limited to 'test/MultiDex')
0 files changed, 0 insertions, 0 deletions