diff options
| author | Raphael <raphael@google.com> | 2010-04-13 15:25:50 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-04-26 14:06:04 -0700 |
| commit | 21a88c1628ac0a21e177dd0d1f04406061bf7f95 (patch) | |
| tree | 7cfd6492d371af39cb9be2c105c76c8575339cda | |
| parent | e577a83ac173dab41f550ada526de6a3cbb44b9c (diff) | |
Fix adb, fastboot to compile in Windows SDK under Linux.android-cts-2.1_r5android-cts-2.1_r4android-cts-2.1_r3
(Merged from master Change I3d0e4cab)
Change-Id: Ia515c3984cadf3450b7c49b53d234582fa731765
| -rw-r--r-- | adb/Android.mk | 9 | ||||
| -rw-r--r-- | fastboot/Android.mk | 11 | ||||
| -rw-r--r-- | include/arch/windows/AndroidConfig.h | 1 |
3 files changed, 16 insertions, 5 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index f3eaa6e0..1d54b7aa 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -29,13 +29,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 := \ diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 7a9d35f2..34380ecb 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -33,11 +33,18 @@ endif ifeq ($(HOST_OS),windows) LOCAL_SRC_FILES += usb_windows.c util_windows.c EXTRA_STATIC_LIBS := AdbWinApi - LOCAL_C_INCLUDES += /usr/include/w32api/ddk development/host/windows/usb/api - ifeq ($(strip $(USE_CYGWIN)),) + ifneq ($(strip $(USE_CYGWIN)),) + # Pure cygwin case + LOCAL_LDLIBS += -lpthread + 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_STATIC_LIBRARIES := $(EXTRA_STATIC_LIBS) libzipfile libunz diff --git a/include/arch/windows/AndroidConfig.h b/include/arch/windows/AndroidConfig.h index b240519a..799afd52 100644 --- a/include/arch/windows/AndroidConfig.h +++ b/include/arch/windows/AndroidConfig.h @@ -279,7 +279,6 @@ */ #ifdef USE_MINGW #define S_IRGRP 0 -#define sleep _sleep #endif /* |