From: Elliott Hughes <enh@google.com>
Date: Sun, 9 Sep 2012 21:45:32 +0000 (-0700)
Subject: Fix aapt to get expat header files from the approved location.
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/9833539c7b8f55113f661e8b97013252469187f2?ds=sidebyside

Fix aapt to get expat header files from the approved location.

Change-Id: Ic7c796e048cfe98ee355c18b3708fee5ea716e2e
---

diff --git a/Android.mk b/Android.mk
index 482f43e..d9b0681 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,7 +34,6 @@ LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS
 endif
 
 
-LOCAL_C_INCLUDES += external/expat/lib
 LOCAL_C_INCLUDES += external/libpng
 LOCAL_C_INCLUDES += external/zlib
 LOCAL_C_INCLUDES += build/libs/host/include
diff --git a/StringPool.h b/StringPool.h
index d501008..16050b2 100644
--- a/StringPool.h
+++ b/StringPool.h
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <expat.h>
+#include <libexpat/expat.h>
 
 using namespace android;