commit 11cbb06b35cbcb488c7f39b71886ce379e57f867
author Christopher Ferris <cferris@google.com> Wed Jun 11 12:20:18 2014 -0700
committer Christopher Ferris <cferris@google.com> Wed Jun 11 12:20:18 2014 -0700
tree e63c065079040ea4f35081c7329c93253fc1e87e
parent 374d6e86df490ee3b192bdb7a12c6ef42c091f59
parent 281b884c42fb6c2ba225009af3ecb4d84fbcc607

resolved conflicts for merge of 281b884c to master

Change-Id: If8924939bdf54d3a9e6a4876a05d0672c27cf8ef

media/libstagefright/rtsp/Android.mk

diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk
index 39eedc0..1e06f7c 100644
--- a/media/libstagefright/rtsp/Android.mk
+++ b/media/libstagefright/rtsp/Android.mk
@@ -26,12 +26,17 @@
 
 LOCAL_MODULE:= libstagefright_rtsp
 
+LOCAL_WHOLE_STATIC_LIBRARIES := \
+	libcrypto_static
+
 ifeq ($(TARGET_ARCH),arm)
     LOCAL_CFLAGS += -Wno-psabi
 endif
 
 LOCAL_CFLAGS += -Werror
 
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
 include $(BUILD_STATIC_LIBRARY)
 
 ################################################################################
@@ -57,4 +62,6 @@
 
 LOCAL_MODULE:= rtp_test
 
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+
 # include $(BUILD_EXECUTABLE)