diff options
| author | Elliott Hughes <enh@google.com> | 2015-06-24 19:30:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-24 19:30:58 +0000 |
| commit | 75d47421d0fc1458fad97c32e7fcb6e2d94f3f44 (patch) | |
| tree | 315fdf00b3756bff2fc82b42c87230b06f7e2f11 /fastboot | |
| parent | feddd582e7194e034c291f42528dc3f30d496b53 (diff) | |
| parent | c636b64e31cefab659f11d05fcdbedf2fb9cf4c1 (diff) | |
| download | system_core-75d47421d0fc1458fad97c32e7fcb6e2d94f3f44.tar.gz system_core-75d47421d0fc1458fad97c32e7fcb6e2d94f3f44.tar.bz2 system_core-75d47421d0fc1458fad97c32e7fcb6e2d94f3f44.zip | |
Merge "Move fastboot's Windows code to C++."
Diffstat (limited to 'fastboot')
| -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 ee9f5ab23..ce8e15f86 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> |