Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83d69280 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android (Google) Code Review
Browse files

Merge "aapt: expat exports its header files now."

parents e04daec1 51348d20

tools/aapt/Android.mk

+1 −6
Original line number Diff line number Diff line
@@ -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)

tools/aapt/StringPool.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
#include <ctype.h>

#include <errno.h>



#include <libexpat/expat.h>



using namespace android;



#define PRINT_STRING_METRICS 0

tools/aapt/XMLNode.h

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#include "StringPool.h"

#include "ResourceTable.h"



#include <expat.h>



class XMLNode;



extern const char* const RESOURCES_ROOT_NAMESPACE;

tools/aapt2/Android.mk

+1 −7
Original line number Diff line number Diff line
@@ -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)

tools/aapt2/SourceXmlPullParser.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include "XmlPullParser.h"



#include <istream>

#include <libexpat/expat.h>

#include <expat.h>

#include <queue>

#include <stack>

#include <string>