am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files...

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

diff --git a/Android.mk b/Android.mk
index 482f43e1270c291504efd255af63faae2d038741..d9b06815bf658607637b87b062968fd93c190790 100644 (file)
--- 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 d5010086b2928a55adad08884c6d98ddbdd29e48..16050b2711c3a65d1a9d6b44fc5b5a4391021acd 100644 (file)
--- 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;