commit 44d357e1ffc96b19452094340bc077c9871ad4b4
author Jiyong Park <jiyong@google.com> Mon Oct 21 14:34:35 2019 +0900
committer Jiyong Park <jiyong@google.com> Mon Oct 28 09:55:33 2019 +0000
tree c8158247342f2e52e856684adeb8a7195333b6ab
parent f699737282c991120be9572972e39f865a15a624

Replace framework.jar with framework-minus-apex.jar

Bug: 139391334
Test: m, device is bootable
Exempt-From-Owner-Approval: Approved internally
Merged-In: I281f841c164a4813ed4c436fb84680f5ade1ee1d
(cherry picked from commit 219d4ac2b27a852388914088e7dc4ad867d132e0)
Change-Id: I281f841c164a4813ed4c436fb84680f5ade1ee1d

core/pdk_config.mk

diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index 4a069d3..922e0ef 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -22,7 +22,7 @@
   target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \
   target/common/obj/JAVA_LIBRARIES/core-icu4j_intermediates \
   target/common/obj/JAVA_LIBRARIES/ext_intermediates \
-  target/common/obj/JAVA_LIBRARIES/framework_intermediates \
+  target/common/obj/JAVA_LIBRARIES/framework-minus-apex_intermediates \
   target/common/obj/JAVA_LIBRARIES/hwbinder_intermediates \
   target/common/obj/JAVA_LIBRARIES/ims-common_intermediates \
   target/common/obj/JAVA_LIBRARIES/okhttp_intermediates \

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index ae72e04..2fd0312 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -75,7 +75,7 @@
     ExtServices \
     ExtShared \
     flags_health_check \
-    framework \
+    framework-minus-apex \
     framework-res \
     framework-sysconfig.xml \
     fsck_msdos \
@@ -316,7 +316,7 @@
 # The order matters for runtime class lookup performance.
 PRODUCT_BOOT_JARS := \
     $(TARGET_CORE_JARS) \
-    framework \
+    framework-minus-apex \
     ext \
     telephony-common \
     voip-common \