commit 4884f8738d73921825431adb12e0ef66b6541247
author Kenny Root <kroot@google.com> Wed May 14 19:46:07 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 14 19:46:07 2014 +0000
tree 1ce879b0ea9febfb76cd0238579cd319d23146d4
parent 61fa8d83e3be729991f83aee407c450035f73ab4
parent d36d61bec8d728088a300a392b9815555a0203d4

am d36d61be: am abe42666: Move libkeystore to minimal

* commit 'd36d61bec8d728088a300a392b9815555a0203d4':
  Move libkeystore to minimal

target/product/core_base.mk

diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index d63e39f..4c3dc56 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -32,7 +32,6 @@
     libaudioutils \
     libfilterpack_imageproc \
     libgabi++ \
-    libkeystore \
     libmdnssd \
     libnfc_ndef \
     libportable \

target/product/core_minimal.mk

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 7fbdee6..8d9ba15 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -52,6 +52,7 @@
     libdrmframework \
     libdrmframework_jni \
     libfilterfw \
+    libkeystore \
     libsqlite_jni \
     libwilhelm \
     logd \

target/product/core_tiny.mk

diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk
index 9c40206..c127442 100644
--- a/target/product/core_tiny.mk
+++ b/target/product/core_tiny.mk
@@ -57,6 +57,7 @@
     libOpenSLES \
     libdownmix \
     libfilterfw \
+    libkeystore \
     libsqlite_jni \
     libwilhelm \
     make_ext4fs \