commit 918e3ef8a32f8e5b5666b4c58948d2965076912a
author Kenny Root <kroot@google.com> Wed May 01 01:50:47 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 01 01:50:47 2013 +0000
tree b4369367f5d64f39eca87e2de4673184914da09c
parent ba6f0e8916f705df7e9ae666e9fc5a18cef0f273
parent b90d9ebc1004df6c0faeba68d917f0ded2e594d0

Merge "Track change to JSSE"

Android.mk

diff --git a/Android.mk b/Android.mk
index e01982d..de82f05 100644
--- a/Android.mk
+++ b/Android.mk
@@ -54,7 +54,7 @@
 bouncycastle-proguard-deadcode: $(full_classes_compiled_jar) $(full_java_libs)
 	$(PROGUARD) \
 		-injars $(full_classes_compiled_jar) \
-		-libraryjars "$(call normalize-path-list,$(addsuffix (!org/bouncycastle/**.class,!org/apache/harmony/xnet/provider/jsse/OpenSSLMessageDigest.class),$(full_java_libs)))" \
+		-libraryjars "$(call normalize-path-list,$(addsuffix (!org/bouncycastle/**.class,!com/android/org/conscrypt/OpenSSLMessageDigest.class),$(full_java_libs)))" \
 		-dontoptimize \
 		-dontobfuscate \
 		-dontpreverify \