Merge "Move keystore from user_tags to core req"

2012-03-27 20:41:57 -07:00
parent 73ef9bcee3 9ea6952e8a
commit 89912bec23
2 changed files with 3 additions and 1 deletions
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -164,7 +164,6 @@ GRANDFATHERED_USER_MODULES += \
 	jsr305lib \
 	junit \
 	jython \
-	keystore \
 	kxml2-2.3.0 \
 	launch-wrapper \
 	layoutlib \
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -66,6 +66,8 @@ PRODUCT_PACKAGES := \
    ip-up-vpn \
    ip6tables \
    iptables \
+    keystore \
+    keystore.default \
    libandroidfw \
    libOpenMAXAL \
    libOpenSLES \
@@ -79,6 +81,7 @@ PRODUCT_PACKAGES := \
    libgabi++ \
    libicui18n \
    libicuuc \
+    libkeystore \
    libnativehelper \
    libnfc_ndef \
    libpowermanager \