diff options
| author | Raphael <raphael@google.com> | 2010-04-13 15:25:50 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-04-13 15:28:26 -0700 |
| commit | fab167850d751a817c39e074334fe7a0987ce647 (patch) | |
| tree | 7406d506dd4015a8401ad8a9c22f28a984585f09 /adb/Android.mk | |
| parent | 3adde56de1f8878553dd0c89a2fc19b1b93b0f2f (diff) | |
| download | system_core-fab167850d751a817c39e074334fe7a0987ce647.zip system_core-fab167850d751a817c39e074334fe7a0987ce647.tar.gz system_core-fab167850d751a817c39e074334fe7a0987ce647.tar.bz2 | |
Fix adb, fastboot to compile in Windows SDK under Linux.
Change-Id: I3d0e4cabd65d9de17036901a22ec3277a6d58e64
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 6325e53..0c93c1e 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -35,13 +35,18 @@ ifeq ($(HOST_OS),windows) USB_SRCS := usb_windows.c EXTRA_SRCS := get_my_path_windows.c EXTRA_STATIC_LIBS := AdbWinApi - LOCAL_C_INCLUDES += /usr/include/w32api/ddk development/host/windows/usb/api/ ifneq ($(strip $(USE_CYGWIN)),) + # Pure cygwin case LOCAL_LDLIBS += -lpthread - else + LOCAL_C_INCLUDES += /usr/include/w32api/ddk + endif + ifneq ($(strip $(USE_MINGW)),) + # MinGW under Linux case LOCAL_LDLIBS += -lws2_32 USE_SYSDEPS_WIN32 := 1 + LOCAL_C_INCLUDES += /usr/i586-mingw32msvc/include/ddk endif + LOCAL_C_INCLUDES += development/host/windows/usb/api/ endif LOCAL_SRC_FILES := \ |