diff options
| author | Martin Stjernholm <mast@google.com> | 2021-03-16 00:44:25 +0000 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2021-04-12 16:36:03 +0000 |
| commit | d3e9ff326a511ef48ea85afd2de9c292aa6ea20b (patch) | |
| tree | da924af40549dca5fb679173036049e70ca395e9 /build/apex/art_apex_test.py | |
| parent | 4531afd0d813fdfa2bb115522bc5918477c03dc2 (diff) | |
Merge libdexfile_external into libdexfile (reland 2).
To reduce the number of DSO's. libdexfile_external only adds a few
small functions on top of libdexfile, and it's still only those
functions that are available in the APEX stubs.
Also rename libdexfile_external_static to libdexfile_static, for
consistency.
Since libdexfile now has stubs, we need to add test_for properties to
avoid linking against the stubs in tests.
This relands https://r.android.com/1666119 that got submitted out of
order from https://r.android.com/1664026 - prerequisite changes now
submitted with https://r.android.com/1671709.
Test: Flash and boot with userdebug and eng to try both release and
debug modules.
Test: art/tools/buildbot-build.sh {--target,--host}
Test: art/build/apex/runtests.sh
Test: mmm art
Bug: 143978909
Change-Id: I6de99052d6d8a9d01d748baabbbcecfe1f4509dc
Diffstat (limited to 'build/apex/art_apex_test.py')
| -rwxr-xr-x | build/apex/art_apex_test.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py index 110553bfd4..581e20de50 100755 --- a/build/apex/art_apex_test.py +++ b/build/apex/art_apex_test.py @@ -527,7 +527,7 @@ class ReleaseChecker: self._checker.check_symlinked_multilib_executable('dalvikvm') # Check exported libraries for ART. - self._checker.check_native_library('libdexfile_external') + self._checker.check_native_library('libdexfile') self._checker.check_native_library('libnativebridge') self._checker.check_native_library('libnativehelper') self._checker.check_native_library('libnativeloader') @@ -542,7 +542,6 @@ class ReleaseChecker: self._checker.check_native_library('libartpalette') self._checker.check_native_library('libartservice') self._checker.check_native_library('libarttools') - self._checker.check_native_library('libdexfile') self._checker.check_native_library('libdexfile_support') self._checker.check_native_library('libdt_fd_forward') self._checker.check_native_library('libopenjdkjvm') @@ -677,6 +676,9 @@ class DebugChecker: self._checker.check_symlinked_multilib_executable('imgdiagd') self._checker.check_executable('profmand') + # Check exported libraries for ART. + self._checker.check_native_library('libdexfiled') + # Check internal libraries for ART. self._checker.check_native_library('libadbconnectiond') self._checker.check_native_library('libartbased') @@ -684,7 +686,6 @@ class DebugChecker: self._checker.check_native_library('libartd-compiler') self._checker.check_native_library('libartd-dexlayout') self._checker.check_native_library('libartd-disassembler') - self._checker.check_native_library('libdexfiled') self._checker.check_native_library('libopenjdkjvmd') self._checker.check_native_library('libopenjdkjvmtid') self._checker.check_native_library('libprofiled') @@ -707,7 +708,6 @@ class DebugTargetChecker: self._checker.check_executable('oatdumpd') # Check ART internal libraries. - self._checker.check_native_library('libdexfiled_external') self._checker.check_native_library('libperfetto_hprofd') # Check internal native library dependencies. |