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 | 947be6bf6700d07e148f6fbf6308e86b08d3c926 (patch) | |
| tree | a4467af48b00bd2fef9892a657adce4b143e9a6d /media | |
| parent | b89909df83e55af1726ebc97d1a5ecb4905a91ef (diff) | |
| parent | e7c992c675e0075cd60b0b11c06d5956e3ddd7a3 (diff) | |
| download | frameworks_av-947be6bf6700d07e148f6fbf6308e86b08d3c926.zip frameworks_av-947be6bf6700d07e148f6fbf6308e86b08d3c926.tar.gz frameworks_av-947be6bf6700d07e148f6fbf6308e86b08d3c926.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')
| -rw-r--r-- | media/libmedia/Android.mk | 1 | ||||
| -rw-r--r-- | media/libmedia/MediaProfiles.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/Android.mk | 1 | ||||
| -rw-r--r-- | media/libstagefright/MediaCodecList.cpp | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk index 76308e8..54666fb 100644 --- a/media/libmedia/Android.mk +++ b/media/libmedia/Android.mk @@ -64,7 +64,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) diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index 84bc7a7..48bbf8f 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -23,7 +23,7 @@ #include <utils/Log.h> #include <utils/Vector.h> #include <cutils/properties.h> -#include <expat.h> +#include <libexpat/expat.h> #include <media/MediaProfiles.h> #include <media/stagefright/foundation/ADebug.h> #include <OMX_Video.h> 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 { |