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

Merge "Fix aapt to get expat header files from the approved location."

Browse Source
This commit is contained in:
Elliott Hughes
2012-09-09 15:16:45 -07:00
committed by android code review
parent bf3e62b891 ee15e15475
commit bfe1ab8257
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/aapt/Android.mk
View File

@@ -34,7 +34,6 @@ LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS
endif endif
LOCAL_C_INCLUDES += external/expat/lib
LOCAL_C_INCLUDES += external/libpng LOCAL_C_INCLUDES += external/libpng
LOCAL_C_INCLUDES += external/zlib LOCAL_C_INCLUDES += external/zlib
LOCAL_C_INCLUDES += build/libs/host/include LOCAL_C_INCLUDES += build/libs/host/include

2
tools/aapt/StringPool.h
View File

@@ -21,7 +21,7 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <expat.h> #include <libexpat/expat.h>
using namespace android; using namespace android;