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 | |
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')
-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 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) 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 8ad1cb9..ac50470 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -58,7 +58,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 { |