From f8b8c647e4004c0c1d2a1acd6dd8d3aad19539de Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Thu, 19 Dec 2019 02:11:37 +0000
Subject: [PATCH] Revert submission
 1194828-revert-1191937-art_apex_available-DWXQGTKMAR

Reason for revert: relanding with fix
Reverted Changes:
Ic4119368c:Revert submission 1191937-art_apex_available
Ia084976bb:Revert submission 1191937-art_apex_available
Iada86226d:Revert submission 1191937-art_apex_available
Ic76735eac:Revert submission 1191937-art_apex_available
I1eb30e355:Revert submission 1191937-art_apex_available
Icaf95d260:Revert submission 1191937-art_apex_available
Ie8bace4be:Revert submission 1191937-art_apex_available
I8961702cf:Revert submission 1191937-art_apex_available
I39316f9ef:Revert submission 1191937-art_apex_available
I522a7e83b:Revert submission 1191937-art_apex_available
I8b9424976:Revert submission 1191937-art_apex_available
I48b998629:Revert submission 1191937-art_apex_available

Change-Id: I8b4eed03c76153e2469f7b3e2e33c6e20e6e0409
---
 core/main.mk | 50 --------------------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/core/main.mk b/core/main.mk
index 5a1693f15b..17ac502330 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -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 \
@@ -1170,15 +1129,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 \