diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-09 15:11:49 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-09-09 15:11:50 -0700 |
| commit | 5abc91d61718e334e05c6d4858bd868bd5a5769c (patch) | |
| tree | 35734a3eee8059df684d13ef53b625a209f9659e /media | |
| parent | 8b1525663322685ff34d9c09176feebd102e1c3d (diff) | |
| parent | e8057dd8208f0a185109992339a995c518b12780 (diff) | |
| download | frameworks_av-5abc91d61718e334e05c6d4858bd868bd5a5769c.zip frameworks_av-5abc91d61718e334e05c6d4858bd868bd5a5769c.tar.gz frameworks_av-5abc91d61718e334e05c6d4858bd868bd5a5769c.tar.bz2 | |
Merge "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 { |