Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92e1a0be authored by Joseph Murphy's avatar Joseph Murphy
Browse files

Revert submission 1191937-art_apex_available 

Original Commit Message:
"""
Rename modules that are APEX-only

The renamed modules are only available for APEXes, but not for the
platform. Use the <module_name>.<apex_name> syntax to correctly install
the APEX variant of the modules.
"""

Reason for revert: Build Cop - Breaks about 15 AOSP targets, with high confidence due to these changes being the only non-robot changes in those builds.

Reverted Changes:
I190ce2d10:Use apex_available property
I990e0a67e:Use apex_available property
I0d1295683:Revert "Avoid duplicated classes for boot dex jars...
I5fb725403:Find the jar libraries in APEX from the correct pa...
I322b1efcc:Rename modules that are APEX-only
Ifa2bd0f8f:Use apex_available property
Iac6533177:Use apex_available property
Ie999602c6:Use apex_available property
I2a3d73397:Use apex_available property
Ic91bcbb9a:Use apex_available property
Ia6c324eed:Use apex_available property
I964d0125c:Use apex_available property

Change-Id: I8961702cfb414ebec55014f57e0be3347b34cea9
parent 9bc1c003

core/main.mk

+50 −0
Original line number Original line Diff line number Diff line
@@ -1112,6 +1112,47 @@ endef 
# art/build/apex/art_apex_test.py.

# art/build/apex/art_apex_test.py.

# TODO(b/128708192): Implement this restriction in Soong instead.

# 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

# Runtime (Bionic) APEX (native) libraries

APEX_MODULE_LIBS += \

APEX_MODULE_LIBS += \

  libc.so \

  libc.so \
@@ -1128,6 +1169,15 @@ APEX_MODULE_LIBS += \ 
APEX_MODULE_LIBS += \

APEX_MODULE_LIBS += \

  libneuralnetworks.so \

  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)

# Conscrypt APEX JARs (Java libraries)

APEX_MODULE_LIBS += \

APEX_MODULE_LIBS += \

  conscrypt.jar \

  conscrypt.jar \