Loading core/main.mk +17 −1 Original line number Original line Diff line number Diff line Loading @@ -1200,31 +1200,44 @@ endef # Runtime APEX libraries # Runtime APEX libraries APEX_MODULE_LIBS := \ APEX_MODULE_LIBS := \ libadbconnection.so \ libadbconnection.so \ libadbconnectiond.so \ libandroidicu.so \ libandroidicu.so \ libandroidio.so \ libandroidio.so \ libart-compiler.so \ libart-compiler.so \ libart-dexlayout.so \ libart-dexlayout.so \ libart-disassembler.so \ libart.so \ libart.so \ libartbase.so \ libartbase.so \ libartbased.so \ libartd-compiler.so \ libartd-dexlayout.so \ libartd.so \ libartpalette.so \ libartpalette.so \ libc.so \ libdexfile.so \ libdexfile.so \ libdexfile_external.so \ libdexfile_external.so \ libdexfiled.so \ libdexfiled_external.so \ libdexfiled_external.so \ libdl.so \ libdt_fd_forward.so \ libdt_fd_forward.so \ libdt_socket.so \ libdt_socket.so \ libicui18n.so \ libicui18n.so \ libicuuc.so \ libicuuc.so \ libjavacore.so \ libjavacore.so \ libjdwp.so \ libjdwp.so \ libm.so \ libnativebridge.so \ libnativebridge.so \ libnativehelper.so \ libnativehelper.so \ libnativeloader.so \ libnativeloader.so \ libnpt.so \ libnpt.so \ libopenjdk.so \ libopenjdk.so \ libopenjdkjvm.so \ libopenjdkjvm.so \ libopenjdkjvmd.so \ libopenjdkjvmti.so \ libopenjdkjvmti.so \ libopenjdkjvmtid.so \ libpac.so \ libpac.so \ libprofile.so \ libprofile.so \ libprofiled.so \ libsigchain.so \ libsigchain.so \ # Conscrypt APEX libraries # Conscrypt APEX libraries Loading @@ -1235,6 +1248,9 @@ APEX_MODULE_LIBS += \ # still may create these libraries in /system (b/129006418). # still may create these libraries in /system (b/129006418). DISABLE_APEX_LIBS_ABSENCE_CHECK ?= 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 # 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 # 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 # linker config. The native libs are then linked to as usual via exported Loading @@ -1242,7 +1258,7 @@ DISABLE_APEX_LIBS_ABSENCE_CHECK ?= # native architecture. # native architecture. # TODO(b/130630776): Introduce a make variable for the appropriate directory # TODO(b/130630776): Introduce a make variable for the appropriate directory # when native bridge is active. # 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. # Exclude vndk-* subdirectories which contain prebuilts from older releases. APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/vndk-% lib64/vndk-% APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/vndk-% lib64/vndk-% Loading Loading
core/main.mk +17 −1 Original line number Original line Diff line number Diff line Loading @@ -1200,31 +1200,44 @@ endef # Runtime APEX libraries # Runtime APEX libraries APEX_MODULE_LIBS := \ APEX_MODULE_LIBS := \ libadbconnection.so \ libadbconnection.so \ libadbconnectiond.so \ libandroidicu.so \ libandroidicu.so \ libandroidio.so \ libandroidio.so \ libart-compiler.so \ libart-compiler.so \ libart-dexlayout.so \ libart-dexlayout.so \ libart-disassembler.so \ libart.so \ libart.so \ libartbase.so \ libartbase.so \ libartbased.so \ libartd-compiler.so \ libartd-dexlayout.so \ libartd.so \ libartpalette.so \ libartpalette.so \ libc.so \ libdexfile.so \ libdexfile.so \ libdexfile_external.so \ libdexfile_external.so \ libdexfiled.so \ libdexfiled_external.so \ libdexfiled_external.so \ libdl.so \ libdt_fd_forward.so \ libdt_fd_forward.so \ libdt_socket.so \ libdt_socket.so \ libicui18n.so \ libicui18n.so \ libicuuc.so \ libicuuc.so \ libjavacore.so \ libjavacore.so \ libjdwp.so \ libjdwp.so \ libm.so \ libnativebridge.so \ libnativebridge.so \ libnativehelper.so \ libnativehelper.so \ libnativeloader.so \ libnativeloader.so \ libnpt.so \ libnpt.so \ libopenjdk.so \ libopenjdk.so \ libopenjdkjvm.so \ libopenjdkjvm.so \ libopenjdkjvmd.so \ libopenjdkjvmti.so \ libopenjdkjvmti.so \ libopenjdkjvmtid.so \ libpac.so \ libpac.so \ libprofile.so \ libprofile.so \ libprofiled.so \ libsigchain.so \ libsigchain.so \ # Conscrypt APEX libraries # Conscrypt APEX libraries Loading @@ -1235,6 +1248,9 @@ APEX_MODULE_LIBS += \ # still may create these libraries in /system (b/129006418). # still may create these libraries in /system (b/129006418). DISABLE_APEX_LIBS_ABSENCE_CHECK ?= 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 # 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 # 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 # linker config. The native libs are then linked to as usual via exported Loading @@ -1242,7 +1258,7 @@ DISABLE_APEX_LIBS_ABSENCE_CHECK ?= # native architecture. # native architecture. # TODO(b/130630776): Introduce a make variable for the appropriate directory # TODO(b/130630776): Introduce a make variable for the appropriate directory # when native bridge is active. # 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. # Exclude vndk-* subdirectories which contain prebuilts from older releases. APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/vndk-% lib64/vndk-% APEX_LIBS_ABSENCE_CHECK_EXCLUDE += lib/vndk-% lib64/vndk-% Loading
