Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e572e9c7 authored by Raphael's avatar Raphael Committed by Android (Google) Code Review
Browse files

Merge "Fix adb, fastboot to compile in Windows SDK under Linux."

parents c7f0f603 fab16785

adb/Android.mk

+7 −2
Original line number Diff line number Diff line
@@ -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 := \

fastboot/Android.mk

+9 −2
Original line number Diff line number Diff line
@@ -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

include/arch/windows/AndroidConfig.h

+0 −1
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ 
 */

#ifdef USE_MINGW

#define S_IRGRP 0

#define sleep _sleep

#endif



/*