commit 7dc5bfcf42cfb59025f615f494e29ff9e55990cc
author Christopher Ferris <cferris@google.com> Tue Jun 10 15:15:04 2014 -0700
committer Christopher Ferris <cferris@google.com> Tue Jun 10 15:42:01 2014 -0700
tree af628e9334fbc55b7fc8076fd905c6af08f05145
parent d3af4265dca4c8ebcead5376f1c73a5dafc34778

Add libcrypto for users of libstagefright.

libstagefright_rtsp uses some MD5 functions that used to be in bionic,
but it was removed recently. As an initial fix, I statically linked in
libcrypto_static to the libstagefright_rtsp library. However, I think
it's better to modify the single user of this library to link against
the shared libcrypto library.

Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a

media/libmediaplayerservice/Android.mk

diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index 85c9464..a645f13 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -26,6 +26,7 @@
 LOCAL_SHARED_LIBRARIES :=       \
     libbinder                   \
     libcamera_client            \
+    libcrypto                   \
     libcutils                   \
     liblog                      \
     libdl                       \

media/libstagefright/rtsp/Android.mk

diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk
index 7342508..36e8d82 100644
--- a/media/libstagefright/rtsp/Android.mk
+++ b/media/libstagefright/rtsp/Android.mk
@@ -26,9 +26,6 @@
 
 LOCAL_MODULE:= libstagefright_rtsp
 
-LOCAL_WHOLE_STATIC_LIBRARIES := \
-	libcrypto_static
-
 ifeq ($(TARGET_ARCH),arm)
     LOCAL_CFLAGS += -Wno-psabi
 endif