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

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

am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header... 

am 61d09810: am 3150feef: am bfe1ab82: Merge "Fix aapt to get expat header files from the approved location."

* commit '61d09810':
  Fix aapt to get expat header files from the approved location.
parents be3267aa 61d09810

tools/aapt/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ LOCAL_CFLAGS += -D_DARWIN_UNLIMITED_STREAMS 
endif





LOCAL_C_INCLUDES += external/expat/lib

LOCAL_C_INCLUDES += external/libpng

LOCAL_C_INCLUDES += external/zlib

LOCAL_C_INCLUDES += build/libs/host/include

tools/aapt/StringPool.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <ctype.h>

#include <errno.h>



#include <expat.h>

#include <libexpat/expat.h>



using namespace android;