diff options
| author | Elliott Hughes <enh@google.com> | 2015-07-21 11:39:21 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-07-21 17:25:01 -0700 |
| commit | b48adad2ede148b62c7025da4d2320cb5d9af58c (patch) | |
| tree | d58d120d664686ac4836d9f018ea8166d7eef3a3 | |
| parent | 79a1bde2e0f38507738743e490beb895dae7b03e (diff) | |
aapt: expat exports its header files now.
(cherrypick of 51348d2007b801c7bd7350f72e2300f1a5a41dd1)
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
| -rw-r--r-- | tools/aapt/Android.mk | 7 | ||||
| -rw-r--r-- | tools/aapt/StringPool.h | 2 | ||||
| -rw-r--r-- | tools/aapt/XMLNode.h | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk index d551c8efa00f..4f84cf9fbc9c 100644 --- a/tools/aapt/Android.mk +++ b/tools/aapt/Android.mk @@ -53,11 +53,6 @@ aaptTests := \ tests/Pseudolocales_test.cpp \ tests/ResourceFilter_test.cpp -aaptCIncludes := \ - system/core/base/include \ - external/libpng \ - external/zlib - aaptHostLdLibs := aaptHostStaticLibs := \ libandroidfw \ @@ -96,8 +91,8 @@ LOCAL_CPPFLAGS += $(aaptCppFlags) ifeq (darwin,$(HOST_OS)) LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS endif -LOCAL_C_INCLUDES += $(aaptCIncludes) LOCAL_SRC_FILES := $(aaptSources) +LOCAL_STATIC_LIBRARIES += $(aaptHostStaticLibs) include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/tools/aapt/StringPool.h b/tools/aapt/StringPool.h index dbe8c8542185..4b0d920c3274 100644 --- a/tools/aapt/StringPool.h +++ b/tools/aapt/StringPool.h @@ -20,8 +20,6 @@ #include <ctype.h> #include <errno.h> -#include <libexpat/expat.h> - using namespace android; #define PRINT_STRING_METRICS 0 diff --git a/tools/aapt/XMLNode.h b/tools/aapt/XMLNode.h index 3161f6500291..b9e5cd574cdc 100644 --- a/tools/aapt/XMLNode.h +++ b/tools/aapt/XMLNode.h @@ -10,6 +10,8 @@ #include "StringPool.h" #include "ResourceTable.h" +#include <expat.h> + class XMLNode; extern const char* const RESOURCES_ROOT_NAMESPACE; |