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

Commit d149c9e5 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

aapt: expat exports its header files now. 

Change-Id: Iddf0133919d38fc896f97c6796f8228a6decf174
(cherry picked from commit 51348d20)
parent f8480f52

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>

tools/aapt2/XmlDom.h

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



#include <istream>

#include <libexpat/expat.h>

#include <expat.h>

#include <memory>

#include <string>

#include <vector>