summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-06-10 03:11:18 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-10 03:11:18 +0000
commit281b884c42fb6c2ba225009af3ecb4d84fbcc607 (patch)
tree3bf8da93771e734580b85d1fb0ae2b10240d478a /media
parentdd80baf5413e3fb5ce5e1282ce9c0badd0b081f1 (diff)
parentd3af4265dca4c8ebcead5376f1c73a5dafc34778 (diff)
downloadframeworks_av-281b884c42fb6c2ba225009af3ecb4d84fbcc607.zip
frameworks_av-281b884c42fb6c2ba225009af3ecb4d84fbcc607.tar.gz
frameworks_av-281b884c42fb6c2ba225009af3ecb4d84fbcc607.tar.bz2
am d3af4265: Merge "Link libcrypto for MD5_* functions."
* commit 'd3af4265dca4c8ebcead5376f1c73a5dafc34778': Link libcrypto for MD5_* functions.
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/rtsp/Android.mk7
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk
index e77c69c..7342508 100644
--- a/media/libstagefright/rtsp/Android.mk
+++ b/media/libstagefright/rtsp/Android.mk
@@ -26,10 +26,15 @@ LOCAL_C_INCLUDES:= \
LOCAL_MODULE:= libstagefright_rtsp
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+ libcrypto_static
+
ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -Wno-psabi
endif
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
include $(BUILD_STATIC_LIBRARY)
################################################################################
@@ -55,4 +60,6 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE:= rtp_test
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
# include $(BUILD_EXECUTABLE)