diff options
| author | Raphael <raphael@google.com> | 2010-04-15 14:07:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-15 14:07:15 -0700 |
| commit | 153ebc2d2756ee5c0963dbc159c40e810b89cb12 (patch) | |
| tree | 039058ffe04c6262fbf1dd2722769bec59a17f60 /dexdump | |
| parent | 8d27a6c77be018b37a6f874fa6a9660ec6c949b5 (diff) | |
| parent | d9b87a918dfe98793faa08cb59012f652b4b8561 (diff) | |
| download | android_dalvik-153ebc2d2756ee5c0963dbc159c40e810b89cb12.tar.gz android_dalvik-153ebc2d2756ee5c0963dbc159c40e810b89cb12.tar.bz2 android_dalvik-153ebc2d2756ee5c0963dbc159c40e810b89cb12.zip | |
am d9b87a91: Fix dexdump to build in Windows SDK under Linux
Merge commit 'd9b87a918dfe98793faa08cb59012f652b4b8561' into dalvik-dev
* commit 'd9b87a918dfe98793faa08cb59012f652b4b8561':
Fix dexdump to build in Windows SDK under Linux
Diffstat (limited to 'dexdump')
| -rw-r--r-- | dexdump/Android.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dexdump/Android.mk b/dexdump/Android.mk index 910763843..c8720d827 100644 --- a/dexdump/Android.mk +++ b/dexdump/Android.mk @@ -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 |