summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/rtsp
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-06-11 20:49:48 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-11 20:49:48 +0000
commitb9e55c4f17a91f070f78fb9fd72c08e461526e9e (patch)
tree0ba19979f9dc8866047d9dd8102b7416f1085989 /media/libstagefright/rtsp
parent77fc9bbc4163c7ec7ac4b0dabf4f84325cca8473 (diff)
parentca44dc79b5a163030ab0963f80aa771871de092d (diff)
downloadframeworks_av-b9e55c4f17a91f070f78fb9fd72c08e461526e9e.zip
frameworks_av-b9e55c4f17a91f070f78fb9fd72c08e461526e9e.tar.gz
frameworks_av-b9e55c4f17a91f070f78fb9fd72c08e461526e9e.tar.bz2
am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."
* commit 'ca44dc79b5a163030ab0963f80aa771871de092d': Add libcrypto for users of libstagefright.
Diffstat (limited to 'media/libstagefright/rtsp')
-rw-r--r--media/libstagefright/rtsp/Android.mk3
1 files changed, 0 insertions, 3 deletions
diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk
index 1e06f7c..d60dc2f 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