diff options
| author | Martin Stjernholm <mast@google.com> | 2019-05-09 05:06:47 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-09 05:06:47 -0700 |
| commit | d1ed63d2aaf45d5ad236763e04f37da1617885e3 (patch) | |
| tree | 7e784e2b20d95d9709dfa6b8d46afd7aca0ea05e | |
| parent | bcbb7f734a7cc46c735ddb79474e029fff34dbc2 (diff) | |
| parent | f26bef86ec7fc224a3ea73dfeb137e91001897f5 (diff) | |
| download | build-d1ed63d2aaf45d5ad236763e04f37da1617885e3.tar.gz | |
Merge "Extend library absence check to Bionic libs and all ART debug libs."
am: f26bef86ec
Change-Id: Ia4fd7c2eda96b16401c88052067400e2259c6ddf
| -rw-r--r-- | core/main.mk | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/core/main.mk b/core/main.mk index dce78fbda5..df5c13cc2a 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1200,31 +1200,44 @@ endef # 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 @@ -1235,6 +1248,9 @@ APEX_MODULE_LIBS += \ # 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 @@ -1242,7 +1258,7 @@ DISABLE_APEX_LIBS_ABSENCE_CHECK ?= # 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-% |