commit 9ea6952e8af7099477ed1feaedd41c04f4998748
author Kenny Root <kroot@google.com> Thu Mar 08 10:47:34 2012 -0800
committer Kenny Root <kroot@google.com> Thu Mar 15 09:47:07 2012 -0700
tree 9ce5e05c5817df3c607ec040aa9e0b30c233d625
parent bdbbd2062c4651541b2bd4f496480f3ac3be3b74

Move keystore from user_tags to core req

Move the keystore from the grandfathered list to the new core required
packages.

Change-Id: I61343129c3111cab2d6a1d536775ed9764085281

core/user_tags.mk

diff --git a/core/user_tags.mk b/core/user_tags.mk
index 53f0ee2..325c600 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -164,7 +164,6 @@
 	jsr305lib \
 	junit \
 	jython \
-	keystore \
 	kxml2-2.3.0 \
 	launch-wrapper \
 	layoutlib \

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index f655904..f5503e0 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -67,6 +67,8 @@
     ip-up-vpn \
     ip6tables \
     iptables \
+    keystore \
+    keystore.default \
     libandroidfw \
     libOpenMAXAL \
     libOpenSLES \
@@ -80,6 +82,7 @@
     libgabi++ \
     libicui18n \
     libicuuc \
+    libkeystore \
     libnativehelper \
     libnfc_ndef \
     libpowermanager \