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

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

Author: enh-google

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

tools/aapt/StringPool.h

@@ -21,7 +21,7 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <expat.h>
+#include <libexpat/expat.h>
 
 using namespace android;