diff options
author | Narayan Kamath <narayan@google.com> | 2015-01-05 16:43:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-05 16:43:26 +0000 |
commit | 991aa3a70b26c7d9c93361394a43a95355c1c26e (patch) | |
tree | 2ccdc14de16146d86361d679d4780edaea319abc /media/libstagefright | |
parent | 545d5c41f04ec591bd0f034434b6d65ffd4c4c9c (diff) | |
parent | bef17542c7e0563c6004463b1ede18a404a17c89 (diff) | |
download | frameworks_av-991aa3a70b26c7d9c93361394a43a95355c1c26e.zip frameworks_av-991aa3a70b26c7d9c93361394a43a95355c1c26e.tar.gz frameworks_av-991aa3a70b26c7d9c93361394a43a95355c1c26e.tar.bz2 |
am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."
* commit 'bef17542c7e0563c6004463b1ede18a404a17c89':
Remove hardcoded ICU & OpenSSL include paths.
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 193f8a7..7bfd2fb 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -68,11 +68,8 @@ LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/external/flac/include \ $(TOP)/external/tremolo \ - $(TOP)/external/openssl/include \ $(TOP)/external/libvpx/libwebm \ $(TOP)/system/netd/include \ - $(TOP)/external/icu/icu4c/source/common \ - $(TOP)/external/icu/icu4c/source/i18n \ LOCAL_SHARED_LIBRARIES := \ libbinder \ |