diff options
| author | Christopher Ferris <cferris@google.com> | 2014-06-10 15:15:04 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-06-10 15:42:01 -0700 |
| commit | 7dc5bfcf42cfb59025f615f494e29ff9e55990cc (patch) | |
| tree | af628e9334fbc55b7fc8076fd905c6af08f05145 /media | |
| parent | d3af4265dca4c8ebcead5376f1c73a5dafc34778 (diff) | |
| download | frameworks_av-7dc5bfcf42cfb59025f615f494e29ff9e55990cc.zip frameworks_av-7dc5bfcf42cfb59025f615f494e29ff9e55990cc.tar.gz frameworks_av-7dc5bfcf42cfb59025f615f494e29ff9e55990cc.tar.bz2 | |
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
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/rtsp/Android.mk | 3 |
2 files changed, 1 insertions, 3 deletions
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_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libbinder \ libcamera_client \ + libcrypto \ libcutils \ liblog \ libdl \ 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_C_INCLUDES:= \ LOCAL_MODULE:= libstagefright_rtsp -LOCAL_WHOLE_STATIC_LIBRARIES := \ - libcrypto_static - ifeq ($(TARGET_ARCH),arm) LOCAL_CFLAGS += -Wno-psabi endif |