diff options
| author | Christopher Ferris <cferris@google.com> | 2014-06-10 23:46:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-10 23:46:41 +0000 |
| commit | ca44dc79b5a163030ab0963f80aa771871de092d (patch) | |
| tree | 90b01f61f3e9c228430d0790d2f61c3c61d59285 /media | |
| parent | 281b884c42fb6c2ba225009af3ecb4d84fbcc607 (diff) | |
| parent | 8d6d8f546c1d6c55b79b454c720c03a80c738444 (diff) | |
| download | frameworks_av-ca44dc79b5a163030ab0963f80aa771871de092d.zip frameworks_av-ca44dc79b5a163030ab0963f80aa771871de092d.tar.gz frameworks_av-ca44dc79b5a163030ab0963f80aa771871de092d.tar.bz2 | |
am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."
* commit '8d6d8f546c1d6c55b79b454c720c03a80c738444':
Add libcrypto for users of libstagefright.
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 |