summaryrefslogtreecommitdiffstats
path: root/target/product
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-04-29 13:25:29 -0700
committerKenny Root <kroot@google.com>2013-04-29 14:58:54 -0700
commit13611990f693acbb41db67acbbfda5d67828a5fe (patch)
treea7b6c5a2bde93c37fbb0465053a7e88af88a0bc5 /target/product
parent835816ae9eb9de2ae7b75e2318d5eba596f1275c (diff)
downloadbuild-13611990f693acbb41db67acbbfda5d67828a5fe.zip
build-13611990f693acbb41db67acbbfda5d67828a5fe.tar.gz
build-13611990f693acbb41db67acbbfda5d67828a5fe.tar.bz2
Track change to JSSE provider
Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
Diffstat (limited to 'target/product')
-rw-r--r--target/product/core.mk2
-rw-r--r--target/product/mini.mk1
2 files changed, 3 insertions, 0 deletions
diff --git a/target/product/core.mk b/target/product/core.mk
index 022c4f1..aae2fec 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -51,6 +51,7 @@ PRODUCT_PACKAGES += \
cacerts \
com.android.location.provider \
com.android.location.provider.xml \
+ conscrypt \
core \
core-junit \
dalvikvm \
@@ -142,6 +143,7 @@ ifeq ($(WITH_HOST_DALVIK),true)
PRODUCT_PACKAGES += \
apache-xml-hostdex \
bouncycastle-hostdex \
+ conscrypt-hostdex \
core-hostdex \
okhttp-hostdex \
libcrypto \
diff --git a/target/product/mini.mk b/target/product/mini.mk
index a97cbcb..da2fc31 100644
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -71,6 +71,7 @@ PRODUCT_PACKAGES += \
cacerts \
com.android.location.provider \
com.android.location.provider.xml \
+ conscrypt \
core \
core-junit \
dalvikvm \