summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-01-26 19:17:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-26 19:17:37 +0000
commit5c2be9eddba74a503c55808816aa37cc8ce18c50 (patch)
tree22c420a9c52bc419d5e86b54bac4b98284fa260e /media/libstagefright/codecs
parentc1d224dec60ae6bab080752181d94cae9bf9749c (diff)
parentb7909adcef247c627fbe8026624b9ecbeba47655 (diff)
downloadframeworks_av-5c2be9eddba74a503c55808816aa37cc8ce18c50.zip
frameworks_av-5c2be9eddba74a503c55808816aa37cc8ce18c50.tar.gz
frameworks_av-5c2be9eddba74a503c55808816aa37cc8ce18c50.tar.bz2
am b7909adc: am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."
* commit 'b7909adcef247c627fbe8026624b9ecbeba47655': Remove superfluous OpenSSL include paths.
Diffstat (limited to 'media/libstagefright/codecs')
-rw-r--r--media/libstagefright/codecs/on2/enc/Android.mk1
1 files changed, 0 insertions, 1 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 \