Use apex_available property

Use apex_available property to prevent modules that are only for the ART
apex from being used outside of the APEX.

Bug: 128708192
Bug: 133140750
Bug: 129006418
Test: m
Test: m libnativeloader doesn't install anything. (because it doesn't
have "//apex_available:platform".
Test: Add "libnativeloader" to shared_libs of "libvndksupport" which is
installed to /system/lib. Then the build fails with following error:

  error: system/core/libvndksupport/Android.bp:3:1: module
  "libvndksupport" variant "android_arm_armv8-a_core_shared": depends on
  //art/libnativeloader:libnativeloader which is not visible to this
  module

Change-Id: I964d0125cfedb454a60c098bf1a1797201d5dd40
This commit is contained in:
Jiyong Park 2019-12-02 13:47:23 +09:00
parent 2f4a8bb534
commit 0d7bd6be90
1 changed files with 0 additions and 50 deletions

View File

@ -1112,47 +1112,6 @@ endef
# art/build/apex/art_apex_test.py.
# TODO(b/128708192): Implement this restriction in Soong instead.
# ART APEX (native) 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 \
libdexfile.so \
libdexfile_external.so \
libdexfiled.so \
libdexfiled_external.so \
libdt_fd_forward.so \
libdt_socket.so \
libicui18n.so \
libicuuc.so \
libicu_jni.so \
libjavacore.so \
libjdwp.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 \
# Runtime (Bionic) APEX (native) libraries
APEX_MODULE_LIBS += \
libc.so \
@ -1169,15 +1128,6 @@ APEX_MODULE_LIBS += \
APEX_MODULE_LIBS += \
libneuralnetworks.so \
# ART APEX JARs (Java libraries)
APEX_MODULE_LIBS += \
apache-xml.jar \
bouncycastle.jar \
core-icu4j.jar \
core-libart.jar \
core-oj.jar \
okhttp.jar \
# Conscrypt APEX JARs (Java libraries)
APEX_MODULE_LIBS += \
conscrypt.jar \