commit 7a47626d10c4ba236147c402b766d580977bae05
author Martin Stjernholm <mast@google.com> Mon Jun 06 23:23:51 2022 +0100
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 07 10:14:08 2022 +0000
tree 99829227fda4b5da4b57be275b8d148498c08b9c
parent 5bdddf911de55403243778c76d3e6b8080a0e261

Do not expect libartservice(d).so in the host APEX.

Amends https://r.android.com/1573076 and https://r.android.com/2107324.

Test: art/build/apex/runtests.sh
Test: m art-check-testing-apex-gen
Bug: 177273468
Bug: 233915885
Change-Id: Ieef58f68e71a3d6ef361ebcddb3ff6a8018ae9bf

build/apex/art_apex_test.py

diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 5ead8da..c9eff8d 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -473,7 +473,6 @@
     self._checker.check_native_library('libart-disassembler')
     self._checker.check_native_library('libartbase')
     self._checker.check_native_library('libartpalette')
-    self._checker.check_native_library('libartservice')
     self._checker.check_native_library('libarttools')
     self._checker.check_native_library('libdt_fd_forward')
     self._checker.check_native_library('libopenjdkjvm')
@@ -552,6 +551,7 @@
     self._checker.check_symlinked_multilib_executable('dex2oat')
 
     # Check internal libraries for ART.
+    self._checker.check_native_library('libartservice')
     self._checker.check_native_library('libperfetto_hprof')
     self._checker.check_prefer64_library('artd-aidl-ndk')
 
@@ -618,7 +618,6 @@
     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('libartserviced')
     self._checker.check_native_library('libopenjdkjvmd')
     self._checker.check_native_library('libopenjdkjvmtid')
     self._checker.check_native_library('libprofiled')
@@ -640,6 +639,7 @@
     self._checker.check_symlinked_multilib_executable('dex2oatd')
 
     # Check ART internal libraries.
+    self._checker.check_native_library('libartserviced')
     self._checker.check_native_library('libperfetto_hprofd')
 
     # Check internal native library dependencies.