am 7fca18d4: am 29355534: Fix aapt to build in Windows SDK under Linux (91720463) · Commits · e / os / android_frameworks_base

tools/aapt/Android.mk

+6 −6

Original line number	Diff line number	Diff line
		@@ -37,16 +37,16 @@ LOCAL_STATIC_LIBRARIES := \
		libexpat \
		libpng

		LOCAL_LDLIBS := -lz

		ifeq ($(HOST_OS),linux)
		LOCAL_LDLIBS += -lrt
		endif

		ifeq ($(HOST_OS),windows)
		ifeq ($(strip $(USE_CYGWIN),),)
		LOCAL_LDLIBS += -lws2_32
		endif
		# Statically link libz for MinGW (Win SDK under Linux),
		# and dynamically link for all others.
		ifneq ($(strip $(USE_MINGW)),)
		LOCAL_STATIC_LIBRARIES += libz
		else
		LOCAL_LDLIBS += -lz
		endif

		LOCAL_MODULE := aapt