diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-09 16:09:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-09 16:09:15 -0700 |
| commit | 3150feef0b27ad34370904eb12875805f6c84e8a (patch) | |
| tree | 3ee1c94081aad597863e2b624fc3cc87efe403b6 /tools | |
| parent | 3f3ce8adc7a4fcb5ec23a317c8b5063b61ac15a2 (diff) | |
| parent | bfe1ab825731d365fef169deab646d7ceeafc998 (diff) | |
| download | frameworks_base-3150feef0b27ad34370904eb12875805f6c84e8a.zip frameworks_base-3150feef0b27ad34370904eb12875805f6c84e8a.tar.gz frameworks_base-3150feef0b27ad34370904eb12875805f6c84e8a.tar.bz2 | |
am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."
* commit 'bfe1ab825731d365fef169deab646d7ceeafc998':
Fix aapt to get expat header files from the approved location.
Diffstat (limited to 'tools')
| -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 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; |