diff options
| author | Elliott Hughes <enh@google.com> | 2015-06-24 10:48:43 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-06-24 10:48:43 -0700 |
| commit | c636b64e31cefab659f11d05fcdbedf2fb9cf4c1 (patch) | |
| tree | 1759c7957fb8fddc9bd25e1a4eacefa442d07c48 | |
| parent | dc80d03eab1ec5dd300a2a0ee2aa207f67e2ef33 (diff) | |
| download | core-c636b64e31cefab659f11d05fcdbedf2fb9cf4c1.tar.gz core-c636b64e31cefab659f11d05fcdbedf2fb9cf4c1.tar.bz2 core-c636b64e31cefab659f11d05fcdbedf2fb9cf4c1.zip | |
Move fastboot's Windows code to C++.
Change-Id: I92414594cbdbc1896402c6d950d890042f8df6cf
| -rw-r--r-- | fastboot/Android.mk | 2 | ||||
| -rw-r--r-- | fastboot/usb_windows.cpp (renamed from fastboot/usb_windows.c) | 0 | ||||
| -rw-r--r-- | fastboot/util_windows.cpp (renamed from fastboot/util_windows.c) | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 6443a1fc5..825082da8 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -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 diff --git a/fastboot/usb_windows.c b/fastboot/usb_windows.cpp index a09610f5c..a09610f5c 100644 --- a/fastboot/usb_windows.c +++ b/fastboot/usb_windows.cpp diff --git a/fastboot/util_windows.c b/fastboot/util_windows.cpp index 74a5c27b4..ec52f3988 100644 --- a/fastboot/util_windows.c +++ b/fastboot/util_windows.cpp @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#include "fastboot.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> |