diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2020-04-15 16:52:32 +0100 |
|---|---|---|
| committer | David Sehr <sehr@google.com> | 2020-04-23 21:37:24 +0000 |
| commit | 9389c54713d8a25413068fb7605d587ba0c95c73 (patch) | |
| tree | a013307dce2236f4dbb31890015ee5e3b93dbcba /test/ProfileTestMultiDex/Main.java | |
| parent | 271b53e7d90314950f29e8248138d6f4df53ee2d (diff) | |
Put dex2oat32 and dex2oat64 in the ART apex.
Required to move to dex2oat64 on some devices.
Test: m && art_apex_test
Test: art/build/apex/runtests.sh
Bug: 153380900
(cherry picked from commit d68580ee6508bd9d5aa6bbdef33f79b8c2cbcf85)
By default, don't use a bitness suffix for ART.
This will make it pick up the symlink. Only if the bitness is passed
through the command line will we add it to the path.
Test: dalvik/dx/tests/run-all-tests
(cherry picked from commit 745e45d44462af1e58a120f4886ea5c307b66a2e)
Fix logic to find dex2oat.
On device, we now have dex2oat64/dex2oat32 with no symlinks, so be
explicit on the bitness when trying to find the executable.
Bug: 153380900
Test: run-gtests.sh, testrunner.py, run-libcore-tests, run-libjdwp-tests
(cherry picked from commit b0c6cb59ed8f8999d035ea0cabe3c1cd226507f8)
Merged-In: Ie4a75d72a8be3c1252c6b49b29d680dc641b6b61
Merged-In: Ic1bf59ffd760b97b3e173ee48d3ce7ad9bb6c3ce
Merged-In: I8a26f9f38fa589cad0b1b83041181f7637060861
Change-Id: Ib1b8a1869d47493586ed00eca34de7b4bbef0d83
Diffstat (limited to 'test/ProfileTestMultiDex/Main.java')
0 files changed, 0 insertions, 0 deletions