Extend library absence check to Bionic libs and all ART debug libs.
Test: m systemimage
Test: build/soong/build_test.bash
Bug: 124293228
Change-Id: I1a25d8d45668638b7eb0d39ded9cad3ed30db33c
diff --git a/core/main.mk b/core/main.mk
index 6f92ff1..7e9e1af 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1208,31 +1208,44 @@
# Runtime APEX libraries
APEX_MODULE_LIBS := \
libadbconnection.so \
+ libadbconnectiond.so \
libandroidicu.so \
libandroidio.so \
libart-compiler.so \
libart-dexlayout.so \
+ libart-disassembler.so \
libart.so \
libartbase.so \
+ libartbased.so \
+ libartd-compiler.so \
+ libartd-dexlayout.so \
+ libartd.so \
libartpalette.so \
+ libc.so \
libdexfile.so \
libdexfile_external.so \
+ libdexfiled.so \
libdexfiled_external.so \
+ libdl.so \
libdt_fd_forward.so \
libdt_socket.so \
libicui18n.so \
libicuuc.so \
libjavacore.so \
libjdwp.so \
+ libm.so \
libnativebridge.so \
libnativehelper.so \
libnativeloader.so \
libnpt.so \
libopenjdk.so \
libopenjdkjvm.so \
+ libopenjdkjvmd.so \
libopenjdkjvmti.so \
+ libopenjdkjvmtid.so \
libpac.so \
libprofile.so \
+ libprofiled.so \
libsigchain.so \
# Conscrypt APEX libraries
@@ -1243,6 +1256,9 @@
# still may create these libraries in /system (b/129006418).
DISABLE_APEX_LIBS_ABSENCE_CHECK ?=
+# Bionic should not be in /system, except for the bootstrap instance.
+APEX_LIBS_ABSENCE_CHECK_EXCLUDE := lib/bootstrap lib64/bootstrap
+
# Exclude lib/arm and lib/arm64 which contain the native bridge proxy libs. They
# are compiled for the guest architecture and used with an entirely different
# linker config. The native libs are then linked to as usual via exported
@@ -1250,7 +1266,7 @@
# native architecture.
# TODO(b/130630776): Introduce a make variable for the appropriate directory
# when native bridge is active.
-APEX_LIBS_ABSENCE_CHECK_EXCLUDE := lib/arm lib/arm64
+APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/arm lib/arm64
# Exclude vndk-* subdirectories which contain prebuilts from older releases.
APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/vndk-% lib64/vndk-%