commit 12e752225aa96888358294be0d725d499a1c9f03
author Kenny Root <kroot@google.com> Tue Apr 23 22:34:24 2013 -0700
committer Kenny Root <kroot@google.com> Mon Apr 29 15:15:27 2013 -0700
tree d716c7eedc50ccdf146aaca9b55fae969cf753ec
parent 28b1f0ee02e14241ffb81f431fc54053771c1c90

Track change to JSSE provider

Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5

Android.mk

diff --git a/Android.mk b/Android.mk
index b919e9f..dab3229 100644
--- a/Android.mk
+++ b/Android.mk
@@ -235,7 +235,7 @@
 			$(framework_res_source_path)/com/android/internal/R.java
 
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit ext okhttp
+LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt core core-junit ext okhttp
 
 LOCAL_MODULE := framework
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
@@ -400,6 +400,7 @@
 
 framework_docs_LOCAL_JAVA_LIBRARIES := \
 			bouncycastle \
+			conscrypt \
 			core \
 			okhttp \
 			ext \