tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am a00a69e0: am b419c35c: Fix adb, fastboot to compile in Windows SDK under Linux.

Browse source 
Merge commit 'a00a69e07d959f73495e42637fe1f493eb01193d' into kraken

* commit 'a00a69e07d959f73495e42637fe1f493eb01193d':
  Fix adb, fastboot to compile in Windows SDK under Linux.
This commit is contained in:
Raphael 2010-04-23 17:19:01 -07:00 committed by Android Git Automerger
commit ecf835e291
3 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
adb/Android.mk
View file

@ -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 := \

11
fastboot/Android.mk
View file

@ -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

1
include/arch/windows/AndroidConfig.h
View file

@ -296,7 +296,6 @@
*/
#ifdef USE_MINGW
#define S_IRGRP 0
#define sleep _sleep
#endif
/*