Merge "Avoid loading all CA certs into Zygote memory, lazily load instead (1 of 3)"

2011-04-29 20:46:11 -07:00 · 2011-04-29 20:46:11 -07:00 · 76ace42ca2
parent 27f52e54e6 84d1ee8ab3
commit 76ace42ca2
2 changed files with 1 additions and 1 deletions
--- a/core/legacy_prebuilts.mk
+++ b/core/legacy_prebuilts.mk
@ -40,7 +40,6 @@ GRANDFATHERED_ALL_PREBUILT := \
 	bp.img \
 	brcm_guci_drv \
 	bypassfactory \
-	cacerts.bks \
 	cdt.bin \
 	chat-ril \
 	cmu6plus.ok.zip \
--- a/target/product/core.mk
+++ b/target/product/core.mk
@ -25,6 +25,7 @@ PRODUCT_PROPERTY_OVERRIDES := \
 PRODUCT_PACKAGES := \
    apache-xml \
    bouncycastle \
+    cacerts \
    com.android.location.provider \
    com.android.location.provider.xml \
    core \