diff options
Diffstat (limited to 'build/apex/art_apex_test.py')
| -rwxr-xr-x | build/apex/art_apex_test.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py index b1e0ebc8f2..68fe779a9e 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -525,7 +525,7 @@ class ReleaseChecker: self._checker.check_native_library('libart-disassembler') self._checker.check_native_library('libartbase') self._checker.check_native_library('libartpalette') - self._checker.check_native_library('libarttools') + self._checker.check_prefer64_library('libarttools') self._checker.check_native_library('libdt_fd_forward') self._checker.check_native_library('libopenjdkjvm') self._checker.check_native_library('libopenjdkjvmti') @@ -595,7 +595,7 @@ class ReleaseTargetChecker: self._checker.check_symlinked_multilib_executable('dex2oat') # Check internal libraries for ART. - self._checker.check_native_library('libartservice') + self._checker.check_prefer64_library('libartservice') self._checker.check_native_library('libperfetto_hprof') # Check internal Java libraries @@ -677,7 +677,7 @@ class DebugTargetChecker: self._checker.check_symlinked_multilib_executable('dex2oatd') # Check ART internal libraries. - self._checker.check_native_library('libartserviced') + self._checker.check_prefer64_library('libartserviced') self._checker.check_native_library('libperfetto_hprofd') # Check internal native library dependencies. @@ -710,7 +710,7 @@ class TestingTargetChecker: self._checker.check_dir(arch_dir) # Check ART test binaries. - self._checker.check_art_test_executable('art_artd_tests') + self._checker.check_art_test_executable('art_artd_tests', MULTILIB_FIRST) self._checker.check_art_test_executable('art_cmdline_tests') self._checker.check_art_test_executable('art_compiler_tests') self._checker.check_art_test_executable('art_dex2oat_tests') @@ -722,13 +722,13 @@ class TestingTargetChecker: self._checker.check_art_test_executable('art_imgdiag_tests') self._checker.check_art_test_executable('art_libartbase_tests') self._checker.check_art_test_executable('art_libartpalette_tests') - self._checker.check_art_test_executable('art_libartservice_tests') - self._checker.check_art_test_executable('art_libarttools_tests') + self._checker.check_art_test_executable('art_libartservice_tests', MULTILIB_FIRST) + self._checker.check_art_test_executable('art_libarttools_tests', MULTILIB_FIRST) self._checker.check_art_test_executable('art_libdexfile_support_tests') self._checker.check_art_test_executable('art_libdexfile_tests') self._checker.check_art_test_executable('art_libprofile_tests') self._checker.check_art_test_executable('art_oatdump_tests') - self._checker.check_art_test_executable('art_odrefresh_tests') + self._checker.check_art_test_executable('art_odrefresh_tests', MULTILIB_FIRST) self._checker.check_art_test_executable('art_profman_tests') self._checker.check_art_test_executable('art_runtime_tests') self._checker.check_art_test_executable('art_sigchain_tests') |