Move UPDATABLE_BOOT_(MODULES|JARS) to base_system.mk for further extension
Test: build & boot
Bug: 112766913
Change-Id: I5af02d44c4b4163acdc4e3078dcebd84556ee049
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 069828c..bfb4426 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -286,6 +286,10 @@
telephony-common \
voip-common \
ims-common
+PRODUCT_UPDATABLE_BOOT_MODULES := conscrypt
+PRODUCT_UPDATABLE_BOOT_LOCATIONS := \
+ /apex/com.android.conscrypt/javalib/conscrypt.jar
+
# Add the compatibility library that is needed when org.apache.http.legacy
# is removed from the bootclasspath.