diff options
| author | 2012-09-09 15:16:45 -0700 | |
|---|---|---|
| committer | 2012-09-09 15:16:45 -0700 | |
| commit | bfe1ab825731d365fef169deab646d7ceeafc998 (patch) | |
| tree | 3779b8dfd5ebc93b42bd9aab1113f2642c1df0b4 | |
| parent | bf3e62b8913fc2fb88d6bb454a6491424cbd40c5 (diff) | |
| parent | ee15e1547531919effd77fa546daffaef94691a4 (diff) | |
Merge "Fix aapt to get expat header files from the approved location."
| -rw-r--r-- | tools/aapt/Android.mk | 1 | ||||
| -rw-r--r-- | tools/aapt/StringPool.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index 482f43e1270c..d9b06815bf65 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 d5010086b292..16050b2711c3 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; |