Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f9a8221810a0b5aaa4050becaa0aa9d492035ff3':
  aapt: expat exports its header files now.
This commit is contained in:
Elliott Hughes
2015-07-22 01:26:20 +00:00
committed by Android Git Automerger
parent 426020b80d f9a8221810
commit 1c6d9005d3
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/aapt/Android.mk
View File

@@ -53,11 +53,6 @@ aaptTests := \
tests/Pseudolocales_test.cpp \ tests/Pseudolocales_test.cpp \
tests/ResourceFilter_test.cpp tests/ResourceFilter_test.cpp
aaptCIncludes := \
system/core/base/include \
external/libpng \
external/zlib
aaptHostLdLibs := aaptHostLdLibs :=
aaptHostStaticLibs := \ aaptHostStaticLibs := \
libandroidfw \ libandroidfw \
@@ -96,8 +91,8 @@ LOCAL_CPPFLAGS += $(aaptCppFlags)
ifeq (darwin,$(HOST_OS)) ifeq (darwin,$(HOST_OS))
LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS
endif endif
LOCAL_C_INCLUDES += $(aaptCIncludes)
LOCAL_SRC_FILES := $(aaptSources) LOCAL_SRC_FILES := $(aaptSources)
LOCAL_STATIC_LIBRARIES += $(aaptHostStaticLibs)
include $(BUILD_HOST_STATIC_LIBRARY) include $(BUILD_HOST_STATIC_LIBRARY)

2
tools/aapt/StringPool.h
View File

@@ -20,8 +20,6 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <libexpat/expat.h>
using namespace android; using namespace android;
#define PRINT_STRING_METRICS 0 #define PRINT_STRING_METRICS 0

2
tools/aapt/XMLNode.h
View File

@@ -10,6 +10,8 @@
#include "StringPool.h" #include "StringPool.h"
#include "ResourceTable.h" #include "ResourceTable.h"
#include <expat.h>
class XMLNode; class XMLNode;
extern const char* const RESOURCES_ROOT_NAMESPACE; extern const char* const RESOURCES_ROOT_NAMESPACE;