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

2012-09-09 15:16:45 -07:00
parent bf3e62b891 ee15e15475
commit bfe1ab8257
2 changed files with 1 additions and 2 deletions
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/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
--- a/tools/aapt/StringPool.h
+++ b/tools/aapt/StringPool.h
@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <errno.h>

-#include <expat.h>
+#include <libexpat/expat.h>

 using namespace android;