diff options
| author | Elliott Hughes <enh@google.com> | 2012-09-09 16:13:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-09 16:13:11 -0700 |
| commit | e3e5349874fd1534cafe6f8c1cd28bf4f53181c3 (patch) | |
| tree | c04417c39b8415c08dc573d87bef0abd1f9fd462 /tools | |
| parent | be3267aad1faacc0ee767e746018e7b795a9b151 (diff) | |
| parent | 61d09810a7b478810adc15af2495136255377e25 (diff) | |
| download | frameworks_base-e3e5349874fd1534cafe6f8c1cd28bf4f53181c3.zip frameworks_base-e3e5349874fd1534cafe6f8c1cd28bf4f53181c3.tar.gz frameworks_base-e3e5349874fd1534cafe6f8c1cd28bf4f53181c3.tar.bz2 | |
am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."
* commit '61d09810a7b478810adc15af2495136255377e25':
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; |