ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am c078d54a: am 75d47421: Merge "Move fastboot\'s Windows code to C++."

Browse source 
* commit 'c078d54adc4342c9573a7b9a8fdc13fb4c83c635':
  Move fastboot's Windows code to C++.
This commit is contained in:
Elliott Hughes 2015-06-24 19:55:05 +00:00 • committed by Android Git Automerger
commit 7d61df8bf7
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fastboot/Android.mk
View file

@ -40,7 +40,7 @@ ifeq ($(HOST_OS),darwin)
endif endif
ifeq ($(HOST_OS),windows) 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 EXTRA_STATIC_LIBS := AdbWinApi
ifneq ($(strip $(USE_CYGWIN)),) ifneq ($(strip $(USE_CYGWIN)),)
# Pure cygwin case # Pure cygwin case

0
fastboot/usb_windows.c → fastboot/usb_windows.cpp
View file

2
fastboot/util_windows.c → fastboot/util_windows.cpp
View file

@ -26,6 +26,8 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include "fastboot.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>