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

Commit 75d47421 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Move fastboot's Windows code to C++."

parents feddd582 c636b64e

fastboot/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ ifeq ($(HOST_OS),darwin) 
endif



ifeq ($(HOST_OS),windows)

  LOCAL_SRC_FILES += usb_windows.c util_windows.c

  LOCAL_SRC_FILES += usb_windows.cpp util_windows.cpp

  EXTRA_STATIC_LIBS := AdbWinApi

  ifneq ($(strip $(USE_CYGWIN)),)

    # Pure cygwin case

fastboot/usb_windows.c→fastboot/usb_windows.cpp

+0 −0

File moved.

View file

fastboot/util_windows.c→fastboot/util_windows.cpp

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
 * SUCH DAMAGE.

 */



#include "fastboot.h"



#include <stdio.h>

#include <stdlib.h>

#include <string.h>