summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Elliott Hughes <enh@google.com> 2015-07-21 11:39:21 -0700
committer Elliott Hughes <enh@google.com> 2015-07-21 11:39:21 -0700
commit51348d2007b801c7bd7350f72e2300f1a5a41dd1 (patch)
tree6c9034eed32755e3e63715753645f8b8b4a416a9
parentc25f41917ee5cb7be00107743a799f1e533639b6 (diff)
aapt: expat exports its header files now.
Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
-rw-r--r--tools/aapt/Android.mk7
-rw-r--r--tools/aapt/StringPool.h2
-rw-r--r--tools/aapt/XMLNode.h2
-rw-r--r--tools/aapt2/Android.mk8
-rw-r--r--tools/aapt2/SourceXmlPullParser.h2
-rw-r--r--tools/aapt2/XmlDom.h2
6 files changed, 6 insertions, 17 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;
diff --git a/tools/aapt2/Android.mk b/tools/aapt2/Android.mk
index 10f81502f268..e5c42d5f74c1 100644
--- a/tools/aapt2/Android.mk
+++ b/tools/aapt2/Android.mk
@@ -82,10 +82,6 @@ testSources := \
XmlDom_test.cpp \
XmlFlattener_test.cpp
-cIncludes := \
- external/libpng \
- external/libz
-
hostLdLibs :=
hostStaticLibs := \
@@ -114,7 +110,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libaapt2
LOCAL_SRC_FILES := $(sources)
-LOCAL_C_INCLUDES += $(cIncludes)
+LOCAL_STATIC_LIBRARIES += $(hostStaticLibs)
LOCAL_CFLAGS += $(cFlags)
LOCAL_CPPFLAGS += $(cppFlags)
@@ -130,7 +126,6 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(testSources)
-LOCAL_C_INCLUDES += $(cIncludes)
LOCAL_STATIC_LIBRARIES += libaapt2 $(hostStaticLibs)
LOCAL_LDLIBS += $(hostLdLibs)
LOCAL_CFLAGS += $(cFlags)
@@ -146,7 +141,6 @@ LOCAL_MODULE := aapt2
LOCAL_SRC_FILES := $(main)
-LOCAL_C_INCLUDES += $(cIncludes)
LOCAL_STATIC_LIBRARIES += libaapt2 $(hostStaticLibs)
LOCAL_LDLIBS += $(hostLdLibs)
LOCAL_CFLAGS += $(cFlags)
diff --git a/tools/aapt2/SourceXmlPullParser.h b/tools/aapt2/SourceXmlPullParser.h
index 15936d655745..d8ed45952b31 100644
--- a/tools/aapt2/SourceXmlPullParser.h
+++ b/tools/aapt2/SourceXmlPullParser.h
@@ -20,7 +20,7 @@
#include "XmlPullParser.h"
#include <istream>
-#include <libexpat/expat.h>
+#include <expat.h>
#include <queue>
#include <stack>
#include <string>
diff --git a/tools/aapt2/XmlDom.h b/tools/aapt2/XmlDom.h
index 69318840445d..035e7c46d1b5 100644
--- a/tools/aapt2/XmlDom.h
+++ b/tools/aapt2/XmlDom.h
@@ -21,7 +21,7 @@
#include "StringPiece.h"
#include <istream>
-#include <libexpat/expat.h>
+#include <expat.h>
#include <memory>
#include <string>
#include <vector>