diff options
author | Narayan Kamath <narayan@google.com> | 2015-01-05 16:38:12 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-05 16:38:12 +0000 |
commit | bef17542c7e0563c6004463b1ede18a404a17c89 (patch) | |
tree | 935387106ec3d923f28426915b8bfcd2bc57d130 /media/libstagefright | |
parent | 0b87c0d9e074384d05e6563c1b1cf5dbd5246436 (diff) | |
parent | 5c97c4e1b0a45e52f463eeef37cd672372644613 (diff) | |
download | frameworks_av-bef17542c7e0563c6004463b1ede18a404a17c89.zip frameworks_av-bef17542c7e0563c6004463b1ede18a404a17c89.tar.gz frameworks_av-bef17542c7e0563c6004463b1ede18a404a17c89.tar.bz2 |
am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."
* commit '5c97c4e1b0a45e52f463eeef37cd672372644613':
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 \ |