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

Commit f100252f authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "AAPT2 statically link libz on Windows builds"

parents fd2b4674 feefeb4f

tools/aapt2/Android.mk

+7 −1
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ testSources := \ 
	XmlFlattener_test.cpp



cIncludes :=

hostLdLibs :=



hostLdLibs := -lz

hostStaticLibs := \

	libandroidfw \

	libutils \
@@ -80,6 +80,12 @@ hostStaticLibs := \ 
	libexpat \

	libziparchive-host



ifneq ($(strip $(USE_MINGW)),)

	hostStaticLibs += libz

else

	hostLdLibs += -lz

endif



cFlags := -Wall -Werror -Wno-unused-parameter -UNDEBUG

cppFlags := -std=c++11 -Wno-missing-field-initializers