Merge changes from topic "revert-1191937-art_apex_available-DWXQGTKMAR"
* changes:
Revert submission 1191937-art_apex_available
Revert submission 1191937-art_apex_available
diff --git a/core/main.mk b/core/main.mk
index 17ac502..5a1693f 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1112,6 +1112,47 @@
# 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 += \
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 \
diff --git a/core/tasks/boot_jars_package_check.mk b/core/tasks/boot_jars_package_check.mk
index ba383f5..dc79e23 100644
--- a/core/tasks/boot_jars_package_check.mk
+++ b/core/tasks/boot_jars_package_check.mk
@@ -22,10 +22,7 @@
intermediates := $(call intermediates-dir-for, PACKAGING, boot-jars-package-check,,COMMON)
stamp := $(intermediates)/stamp
-art_boot_jars := $(addsuffix .com.android.art.release,$(filter $(ART_APEX_JARS), $(PRODUCT_BOOT_JARS)))
-conscrypt_boot_jars := $(addsuffix .com.android.conscrypt,$(filter conscrypt, $(PRODUCT_BOOT_JARS)))
-noncore_boot_jars := $(filter-out $(ART_APEX_JARS) conscrypt, $(PRODUCT_BOOT_JARS))
-built_boot_jars := $(foreach j, $(art_boot_jars) $(conscrypt_boot_jars) $(noncore_boot_jars), \
+built_boot_jars := $(foreach j, $(PRODUCT_BOOT_JARS), \
$(call intermediates-dir-for, JAVA_LIBRARIES, $(j),,COMMON)/classes.jar)
script := build/make/core/tasks/check_boot_jars/check_boot_jars.py
whitelist_file := build/make/core/tasks/check_boot_jars/package_whitelist.txt