From e8057dd8208f0a185109992339a995c518b12780 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Sun, 9 Sep 2012 14:58:14 -0700
Subject: Fix libmedia and libstagefright to get expat header files from the
 approved location.

Found during a libexpat upgrade.

Change-Id: I9e5abd502a884975d898486edde374fb2519164e
---
 media/libmedia/Android.mk               | 1 -
 media/libmedia/MediaProfiles.cpp        | 2 +-
 media/libstagefright/Android.mk         | 1 -
 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 {
 
-- 
cgit v1.1