diff options
| author | Kenny Root <kroot@google.com> | 2015-01-26 18:52:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-26 18:52:02 +0000 |
| commit | cbb803a57f8bbfbdcc3e9857d16a38a47106a26c (patch) | |
| tree | 803ba36e5830c8ae133edf7c7ca3f12f73c2bb79 /media | |
| parent | 1ed13b3b443735e7f7b5002954f31741b0b1c572 (diff) | |
| parent | 683202e1d42d2642f7471272b4a3b5d64525a7bf (diff) | |
| download | frameworks_av-cbb803a57f8bbfbdcc3e9857d16a38a47106a26c.zip frameworks_av-cbb803a57f8bbfbdcc3e9857d16a38a47106a26c.tar.gz frameworks_av-cbb803a57f8bbfbdcc3e9857d16a38a47106a26c.tar.bz2 | |
Merge "Remove superfluous OpenSSL include paths."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/on2/enc/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/httplive/Android.mk | 3 | ||||
| -rw-r--r-- | media/libstagefright/rtsp/Android.mk | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/media/libstagefright/codecs/on2/enc/Android.mk b/media/libstagefright/codecs/on2/enc/Android.mk index e265104..253fa04 100644 --- a/media/libstagefright/codecs/on2/enc/Android.mk +++ b/media/libstagefright/codecs/on2/enc/Android.mk @@ -6,7 +6,6 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(TOP)/external/libvpx/libvpx \ - $(TOP)/external/openssl/include \ $(TOP)/external/libvpx/libvpx/vpx_codec \ $(TOP)/external/libvpx/libvpx/vpx_ports \ frameworks/av/media/libstagefright/include \ diff --git a/media/libstagefright/httplive/Android.mk b/media/libstagefright/httplive/Android.mk index e8d558c..93b7935 100644 --- a/media/libstagefright/httplive/Android.mk +++ b/media/libstagefright/httplive/Android.mk @@ -10,8 +10,7 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/av/media/libstagefright \ - $(TOP)/frameworks/native/include/media/openmax \ - $(TOP)/external/openssl/include + $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Werror diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk index d60dc2f..9fedb71 100644 --- a/media/libstagefright/rtsp/Android.mk +++ b/media/libstagefright/rtsp/Android.mk @@ -19,10 +19,11 @@ LOCAL_SRC_FILES:= \ ASessionDescription.cpp \ SDPLoader.cpp \ +LOCAL_SHARED_LIBRARIES += libcrypto + LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/av/media/libstagefright \ - $(TOP)/frameworks/native/include/media/openmax \ - $(TOP)/external/openssl/include + $(TOP)/frameworks/native/include/media/openmax LOCAL_MODULE:= libstagefright_rtsp |