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

Commit f9a82218 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 86d5fc28: Merge "aapt: expat exports its header files now." 

* commit '86d5fc28':
  aapt: expat exports its header files now.
parents ef3ca9f3 86d5fc28

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;