1 files changed, 2 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index 1d54899..82886fc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -247,7 +247,7 @@ LOCAL_INTERMEDIATE_SOURCES := \
 			$(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
@@ -415,6 +415,7 @@ framework_docs_LOCAL_INTERMEDIATE_SOURCES := \
 
 framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \
 	bouncycastle \
+	conscrypt \
 	core \
 	okhttp \
 	ext \