commit b683895db83a16e29e073fa609aa9f5ddc176191
author Colin Cross <ccross@google.com> Wed Mar 28 09:34:16 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 28 09:34:16 2012 -0700
tree 0ac225854275cddc562d848926655c5045afcd0d
parent 89912bec232e5121b56231dc6a5ed173f54ed902
parent 8f4c3116b2480b89c37e7a0ca6d87681a09fd340

Merge "telephony: remove default apns_conf.xml"

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 8f6b0e7..38a5a6c 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -66,6 +66,8 @@
     ip-up-vpn \
     ip6tables \
     iptables \
+    keystore \
+    keystore.default \
     libandroidfw \
     libOpenMAXAL \
     libOpenSLES \
@@ -79,6 +81,7 @@
     libgabi++ \
     libicui18n \
     libicuuc \
+    libkeystore \
     libnativehelper \
     libnfc_ndef \
     libpowermanager \