summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-09-09 14:45:32 -0700
committerElliott Hughes <enh@google.com>2012-09-09 14:45:32 -0700
commitee15e1547531919effd77fa546daffaef94691a4 (patch)
treec1d9284ef63cfb465dfab4151151a06a9c8bea40 /tools
parentbb60bc26020f3aabc50aa93ad9bf812af7f48f9c (diff)
downloadframeworks_base-ee15e1547531919effd77fa546daffaef94691a4.zip
frameworks_base-ee15e1547531919effd77fa546daffaef94691a4.tar.gz
frameworks_base-ee15e1547531919effd77fa546daffaef94691a4.tar.bz2
Fix aapt to get expat header files from the approved location.
Change-Id: Ic7c796e048cfe98ee355c18b3708fee5ea716e2e
Diffstat (limited to 'tools')
-rw-r--r--tools/aapt/Android.mk1
-rw-r--r--tools/aapt/StringPool.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 482f43e..d9b0681 100644
--- 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
diff --git a/tools/aapt/StringPool.h b/tools/aapt/StringPool.h
index d501008..16050b2 100644
--- 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;