summaryrefslogtreecommitdiff
path: root/build/apex/art_apex_test.py
diff options
context:
space:
mode:
author Jiakai Zhang <jiakaiz@google.com> 2024-07-12 19:34:18 +0100
committer Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-07-18 00:50:02 +0000
commit399d238b18bd475f095d5d0cb004c846b5997307 (patch)
tree72060542311d9e20315fe91be22d02b412683faa /build/apex/art_apex_test.py
parentc295d71a564b86bec353d106c63912da46a91bb5 (diff)
Remove the second arch "libarttools" and "libartservice".
This change saves 160KB. Bug: 345462161 Test: m com.android.art Test: m art-check-release-apex-gen Test: m art-check-debug-apex-gen Test: m art-check-testing-apex-gen Change-Id: Ia2525e6a695632a3114d1e2afebad90c4a212040
Diffstat (limited to 'build/apex/art_apex_test.py')
-rwxr-xr-xbuild/apex/art_apex_test.py14
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')