From b8b08bdd02917e374b2cf95bcbbe1af50a3f0794 Mon Sep 17 00:00:00 2001
From: Pete Bentley <prb@google.com>
Date: Fri, 11 Jan 2019 15:33:43 +0000
Subject: [PATCH] Move remaining libcore JNI libraries to APEX.

Test: Flash and boot on Taimen
Test: atest CtsLibcoreTestCases CtsJniTestCases
Bug: 119090773
Change-Id: Ia9e7077327d2abc3f637c09acc5933b9c1682d5a
Exempt-From-Owner-Approval: Simple clean steps rule
---
 CleanSpec.mk                     | 6 ++++++
 target/product/runtime_libart.mk | 9 ---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 8a28303304..f09b892fa6 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -535,6 +535,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
 # Remove corrupt generated rule due to using toybox's sed
 $(call add-clean-step, rm -rf $(SOONG_OUT_DIR)/.intermediates/system/core/init/generated_stub_builtin_function_map)
 
+# Clean up core JNI libraries moved to runtime apex
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libjavacore.so)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libopenjdk.so)
+$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/lib*/libexpat.so)
+
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index f1b09c163a..9057e32caa 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -33,15 +33,6 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     ext \
 
-# Why are we pulling in expat, which is used in frameworks, only, it seem?
-PRODUCT_PACKAGES += \
-    libexpat \
-
-# Libcore.
-PRODUCT_PACKAGES += \
-    libjavacore \
-    libopenjdk \
-
 # Libcore ICU. TODO: Try to figure out if/why we need them explicitly.
 PRODUCT_PACKAGES += \
     libicui18n \