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

Commit 61042b72 authored by Joseph Murphy's avatar Joseph Murphy Committed by android-build-merger
Browse files

Merge changes from topic "revert-1191937-art_apex_available-DWXQGTKMAR"

am: 7378ff15

Change-Id: Ic73ed24de50252561c6b3acaa95382eff93d18c9
parents 86af17a5 7378ff15
Loading
Loading
Loading
Loading
+50 −0
Original line number Diff line number Diff line
@@ -1112,6 +1112,47 @@ 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 \
@@ -1129,6 +1170,15 @@ 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 \