Merge changes from topic "art_apex_available"
* changes:
Add boringssl_self_test to PRODUCT_PACKAGES
Revert submission 1194828-revert-1191937-art_apex_available-DWXQGTKMAR
diff --git a/core/main.mk b/core/main.mk
index 5a1693f..17ac502 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1112,47 +1112,6 @@
# 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 \
@@ -1170,15 +1129,6 @@
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/target/product/base_system.mk b/target/product/base_system.mk
index d15e262..5916bfe 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -269,6 +269,10 @@
wifi-service \
wm \
+# TODO(b/146549048) remove this
+PRODUCT_PACKAGES += \
+ boringssl_self_test
+
# VINTF data for system image
PRODUCT_PACKAGES += \
system_manifest.xml \