tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Extend library absence check to Bionic libs and all ART debug libs." am: f26bef86ec am: d1ed63d2aa

Browse source 
am: d0a2283d4b

Change-Id: I5b89aa33d35022fdca7f19c98f1bae51c173a876
This commit is contained in:
Martin Stjernholm 2019-05-09 05:18:24 -07:00 committed by android-build-merger
commit c2e0205927
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/main.mk
View file

@ -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
@ -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
@ -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-%