diff options
author | Adam Langley <agl@google.com> | 2015-01-22 17:14:35 -0800 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-01-22 17:14:35 -0800 |
commit | 683202e1d42d2642f7471272b4a3b5d64525a7bf (patch) | |
tree | 803ba36e5830c8ae133edf7c7ca3f12f73c2bb79 /media | |
parent | 1ed13b3b443735e7f7b5002954f31741b0b1c572 (diff) | |
download | frameworks_av-683202e1d42d2642f7471272b4a3b5d64525a7bf.zip frameworks_av-683202e1d42d2642f7471272b4a3b5d64525a7bf.tar.gz frameworks_av-683202e1d42d2642f7471272b4a3b5d64525a7bf.tar.bz2 |
Remove superfluous OpenSSL include paths.
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.
Change-Id: If9df76e6fefb7419cbb2fb33a0264626c748561e
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 |