Permalink
Browse files

am 4245249: Fix dexdump to build in Windows SDK under Linux

Merge commit '4245249472f7172de80874190559f6d2ef9c3803' into froyo-plus-aosp

* commit '4245249472f7172de80874190559f6d2ef9c3803':
  Fix dexdump to build in Windows SDK under Linux
  • Loading branch information...
Raphael Android Git Automerger
Raphael authored and Android Git Automerger committed Apr 24, 2010
2 parents 770379e + 4245249 commit 3e557951fa772390551d50c85ddd584e4370fb15
Showing with 6 additions and 0 deletions.
  1. +6 −0 dexdump/Android.mk
View
@@ -63,7 +63,13 @@ LOCAL_SRC_FILES := $(dexdump_src_files)
LOCAL_C_INCLUDES := $(dexdump_c_includes)
LOCAL_SHARED_LIBRARIES := $(dexdump_shared_libraries)
LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) liblog
+
+ifneq ($(strip $(USE_MINGW)),)
+LOCAL_STATIC_LIBRARIES += libz
+else
LOCAL_LDLIBS += -lpthread -lz
+endif
+
include $(BUILD_HOST_EXECUTABLE)
endif # !TARGET_SIMULATOR

0 comments on commit 3e55795

Please sign in to comment.