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

Commit 31a4f6ff authored by Raphael's avatar Raphael Committed by Android Git Automerger
Browse files

am 575cf4dc: am 4c70244c: Make zipalign build for the Win SDK under Linux.

Merge commit '575cf4dc' into kraken

* commit '575cf4dc':
  Make zipalign build for the Win SDK under Linux.
parents 19ca463e 575cf4dc
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -18,17 +18,14 @@ LOCAL_STATIC_LIBRARIES := \
	libutils \
	libcutils

LOCAL_LDLIBS := -lz

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

# dunno if we need this, but some of the other tools include it
ifeq ($(HOST_OS),windows)
ifeq ($(strip $(USE_CYGWIN),),)
LOCAL_LDLIBS += -lws2_32
endif
ifneq ($(strip $(USE_MINGW)),)
LOCAL_STATIC_LIBRARIES += libz
else
LOCAL_LDLIBS += -lz
endif

LOCAL_MODULE := zipalign