commit 068012174ace0b90f5ef78b89e6d7a673cbf9158
author Brian Carlstrom <bdc@google.com> Tue Apr 13 16:39:24 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 13 16:39:24 2010 -0700
tree 2083e5b45e25e86063cd60b34d6cb0a43571cc7a
parent 01ac2e904a4ad8d77c8e65233e6d6f1fcaa5f552
parent 7f9d8bc8c32fa4196cff8a8f1c64c5183eefad9e

am 7f9d8bc8: disable handshake_cutthrough.patch

Merge commit '7f9d8bc8c32fa4196cff8a8f1c64c5183eefad9e' into kraken

* commit '7f9d8bc8c32fa4196cff8a8f1c64c5183eefad9e':
  disable handshake_cutthrough.patch

patches/ssl_Android.mk

diff --git a/patches/ssl_Android.mk b/patches/ssl_Android.mk
index 6544fc5..0ea0b45 100644
--- a/patches/ssl_Android.mk
+++ b/patches/ssl_Android.mk
@@ -64,7 +64,7 @@
 
 LOCAL_C_INCLUDES += $(local_c_includes)
 
-LOCAL_SHARED_LIBRARIES := libssl
+LOCAL_SHARED_LIBRARIES := libssl libcrypto
 
 include $(LOCAL_PATH)/../android-config.mk
 

ssl/Android.mk

diff --git a/ssl/Android.mk b/ssl/Android.mk
index 6544fc5..0ea0b45 100644
--- a/ssl/Android.mk
+++ b/ssl/Android.mk
@@ -64,7 +64,7 @@
 
 LOCAL_C_INCLUDES += $(local_c_includes)
 
-LOCAL_SHARED_LIBRARIES := libssl
+LOCAL_SHARED_LIBRARIES := libssl libcrypto
 
 include $(LOCAL_PATH)/../android-config.mk