diff options
Diffstat (limited to 'build/apex/art_apex_test.py')
| -rwxr-xr-x | build/apex/art_apex_test.py | 42 |
1 files changed, 37 insertions, 5 deletions
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py index bf0f543cb1..6bccdf5926 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -389,10 +389,18 @@ class Checker: """Check bin/filename32, and/or bin/filename64, with symlink bin/filename.""" raise NotImplementedError + def check_symlinked_first_executable(self, filename): + """Check bin/filename32, and/or bin/filename64, with symlink bin/filename.""" + raise NotImplementedError + def check_multilib_executable(self, filename): """Check bin/filename for 32 bit, and/or bin/filename64.""" raise NotImplementedError + def check_first_executable(self, filename): + """Check bin/filename for 32 bit, and/or bin/filename64.""" + raise NotImplementedError + def check_native_library(self, basename): """Check lib/basename.so, and/or lib64/basename.so.""" raise NotImplementedError @@ -411,8 +419,15 @@ class Arch32Checker(Checker): self.check_executable('%s32' % filename) self.check_executable_symlink(filename) + def check_symlinked_first_executable(self, filename): + self.check_executable('%s32' % filename) + self.check_executable_symlink(filename) + def check_multilib_executable(self, filename): - self.check_executable(filename) + self.check_executable('%s32' % filename) + + def check_first_executable(self, filename): + self.check_executable('%s32' % filename) def check_native_library(self, basename): # TODO: Use $TARGET_ARCH (e.g. check whether it is "arm" or "arm64") to improve @@ -431,9 +446,16 @@ class Arch64Checker(Checker): self.check_executable('%s64' % filename) self.check_executable_symlink(filename) + def check_symlinked_first_executable(self, filename): + self.check_executable('%s64' % filename) + self.check_executable_symlink(filename) + def check_multilib_executable(self, filename): self.check_executable('%s64' % filename) + def check_first_executable(self, filename): + self.check_executable('%s64' % filename) + def check_native_library(self, basename): # TODO: Use $TARGET_ARCH (e.g. check whether it is "arm" or "arm64") to improve # the precision of this test? @@ -452,9 +474,16 @@ class MultilibChecker(Checker): self.check_executable('%s64' % filename) self.check_executable_symlink(filename) + def check_symlinked_first_executable(self, filename): + self.check_executable('%s64' % filename) + self.check_executable_symlink(filename) + def check_multilib_executable(self, filename): self.check_executable('%s64' % filename) - self.check_executable(filename) + self.check_executable('%s32' % filename) + + def check_first_executable(self, filename): + self.check_executable('%s64' % filename) def check_native_library(self, basename): # TODO: Use $TARGET_ARCH (e.g. check whether it is "arm" or "arm64") to improve @@ -482,7 +511,7 @@ class ReleaseChecker: self._checker.check_file('apex_manifest.pb') # Check binaries for ART. - self._checker.check_executable('dex2oat') + self._checker.check_first_executable('dex2oat') self._checker.check_executable('dexdump') self._checker.check_executable('dexlist') self._checker.check_executable('dexoptanalyzer') @@ -579,6 +608,7 @@ class ReleaseTargetChecker: # Check binaries for ART. self._checker.check_executable('oatdump') + self._checker.check_multilib_executable('dex2oat') # Check internal libraries for ART. self._checker.check_prefer64_library('libart-disassembler') @@ -614,7 +644,8 @@ class ReleaseHostChecker: def run(self): # Check binaries for ART. self._checker.check_executable('hprof-conv') - self._checker.check_symlinked_multilib_executable('dex2oatd') + self._checker.check_symlinked_first_executable('dex2oatd') + self._checker.check_symlinked_first_executable('dex2oat') # Check exported native libraries for Managed Core Library. self._checker.check_native_library('libandroidicu-host') @@ -674,7 +705,8 @@ class DebugTargetChecker: def run(self): # Check ART debug binaries. - self._checker.check_executable('dex2oatd') + self._checker.check_multilib_executable('dex2oatd') + self._checker.check_multilib_executable('dex2oat') self._checker.check_executable('oatdumpd') # Check ART internal libraries. |