diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-09 16:11:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-09 16:11:37 -0700 |
| commit | fd48021dfc3278b048ba99ecffe7f996751fb440 (patch) | |
| tree | 95df204b201380b95ae273ab9788d81fce8e3f62 /media/libstagefright | |
| parent | 6ce3d19cd35a49add6893298f70b87917fc60d52 (diff) | |
| parent | e7c992c675e0075cd60b0b11c06d5956e3ddd7a3 (diff) | |
| download | frameworks_av-fd48021dfc3278b048ba99ecffe7f996751fb440.zip frameworks_av-fd48021dfc3278b048ba99ecffe7f996751fb440.tar.gz frameworks_av-fd48021dfc3278b048ba99ecffe7f996751fb440.tar.bz2 | |
am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header files from the approved location."
* commit 'e7c992c675e0075cd60b0b11c06d5956e3ddd7a3':
Fix libmedia and libstagefright to get expat header files from the approved location.
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/MediaCodecList.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index f40982e..faa0f31 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -61,7 +61,6 @@ LOCAL_C_INCLUDES:= \ $(TOP)/frameworks/av/include/media/stagefright/timedtext \ $(TOP)/frameworks/native/include/media/hardware \ $(TOP)/frameworks/native/include/media/openmax \ - $(TOP)/external/expat/lib \ $(TOP)/external/flac/include \ $(TOP)/external/tremolo \ $(TOP)/external/openssl/include \ diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp index 9f6d4a3..d24337f 100644 --- a/media/libstagefright/MediaCodecList.cpp +++ b/media/libstagefright/MediaCodecList.cpp @@ -26,7 +26,7 @@ #include <media/stagefright/OMXCodec.h> #include <utils/threads.h> -#include <expat.h> +#include <libexpat/expat.h> namespace android { |