diff options
author | Elliott Hughes <enh@google.com> | 2012-09-09 16:07:48 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-09 16:07:48 -0700 |
commit | e7c992c675e0075cd60b0b11c06d5956e3ddd7a3 (patch) | |
tree | f97adde9ae532e442c68e00e6143d613751ec7d2 /media/libmedia/Android.mk | |
parent | 371e121745c2e43e3c26fd1a854eaf6d3324f057 (diff) | |
parent | 5abc91d61718e334e05c6d4858bd868bd5a5769c (diff) | |
download | frameworks_av-e7c992c675e0075cd60b0b11c06d5956e3ddd7a3.zip frameworks_av-e7c992c675e0075cd60b0b11c06d5956e3ddd7a3.tar.gz frameworks_av-e7c992c675e0075cd60b0b11c06d5956e3ddd7a3.tar.bz2 |
am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
* commit '5abc91d61718e334e05c6d4858bd868bd5a5769c':
Fix libmedia and libstagefright to get expat header files from the approved location.
Diffstat (limited to 'media/libmedia/Android.mk')
-rw-r--r-- | media/libmedia/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index c8e1dc7..6afc505 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -61,7 +61,6 @@ LOCAL_C_INCLUDES := \ $(call include-path-for, graphics corecg) \ $(TOP)/frameworks/native/include/media/openmax \ external/icu4c/common \ - external/expat/lib \ $(call include-path-for, audio-effects) \ $(call include-path-for, audio-utils) |