diff options
| author | Narayan Kamath <narayan@google.com> | 2015-01-05 16:48:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-05 16:48:49 +0000 |
| commit | 7e7f3ce6b5e6cafc8187b4c62c3d78cd6064f421 (patch) | |
| tree | b0899d3dbaa5e456466063cec0cb5ee50bc5a413 /media/libstagefright/Android.mk | |
| parent | c52fb038dc91712fc5159226006e03ce59b21b9a (diff) | |
| parent | 991aa3a70b26c7d9c93361394a43a95355c1c26e (diff) | |
| download | frameworks_av-7e7f3ce6b5e6cafc8187b4c62c3d78cd6064f421.zip frameworks_av-7e7f3ce6b5e6cafc8187b4c62c3d78cd6064f421.tar.gz frameworks_av-7e7f3ce6b5e6cafc8187b4c62c3d78cd6064f421.tar.bz2 | |
am 991aa3a7: am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."
* commit '991aa3a70b26c7d9c93361394a43a95355c1c26e':
Remove hardcoded ICU & OpenSSL include paths.
Diffstat (limited to 'media/libstagefright/Android.mk')
| -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 609847c..6d9bbae 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -69,11 +69,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 \ |