From: Elliott Hughes <enh@google.com>
Date: Sun, 9 Sep 2012 23:09:15 +0000 (-0700)
Subject: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/4fb118dd3c88c3d67ce24ba9b0a6432f1f7a8f97?hp=e38626fca577d96e74b74e833005d879a7a2e4d2

am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."

* commit 'bfe1ab825731d365fef169deab646d7ceeafc998':
  Fix aapt to get expat header files from the approved location.
---

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;