Loading tools/aapt/Android.mk +6 −6 Original line number Original line Diff line number Diff line Loading @@ -37,16 +37,16 @@ LOCAL_STATIC_LIBRARIES := \ libexpat \ libexpat \ libpng libpng LOCAL_LDLIBS := -lz ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt LOCAL_LDLIBS += -lrt endif endif ifeq ($(HOST_OS),windows) # Statically link libz for MinGW (Win SDK under Linux), ifeq ($(strip $(USE_CYGWIN),),) # and dynamically link for all others. LOCAL_LDLIBS += -lws2_32 ifneq ($(strip $(USE_MINGW)),) endif LOCAL_STATIC_LIBRARIES += libz else LOCAL_LDLIBS += -lz endif endif LOCAL_MODULE := aapt LOCAL_MODULE := aapt Loading Loading
tools/aapt/Android.mk +6 −6 Original line number Original line Diff line number Diff line Loading @@ -37,16 +37,16 @@ LOCAL_STATIC_LIBRARIES := \ libexpat \ libexpat \ libpng libpng LOCAL_LDLIBS := -lz ifeq ($(HOST_OS),linux) ifeq ($(HOST_OS),linux) LOCAL_LDLIBS += -lrt LOCAL_LDLIBS += -lrt endif endif ifeq ($(HOST_OS),windows) # Statically link libz for MinGW (Win SDK under Linux), ifeq ($(strip $(USE_CYGWIN),),) # and dynamically link for all others. LOCAL_LDLIBS += -lws2_32 ifneq ($(strip $(USE_MINGW)),) endif LOCAL_STATIC_LIBRARIES += libz else LOCAL_LDLIBS += -lz endif endif LOCAL_MODULE := aapt LOCAL_MODULE := aapt Loading