Move fastboot's Mac OS code to C++.

Change-Id: I4f452860a401a115b6e8349237923949f2f476d1
aosp-mirror · Jun 24, 2015 · 20750ad · 20750ad
1 parent dc80d03
commit 20750ad
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
@@ -34,7 +34,7 @@ ifeq ($(HOST_OS),linux)
 endif
 
 ifeq ($(HOST_OS),darwin)
-  LOCAL_SRC_FILES += usb_osx.c util_osx.c
+  LOCAL_SRC_FILES += usb_osx.cpp util_osx.cpp
   LOCAL_LDLIBS += -lpthread -framework CoreFoundation -framework IOKit -framework Carbon
   LOCAL_CFLAGS += -Wno-unused-parameter
 endif

diff --git a/fastboot/usb_osx.c → fastboot/usb_osx.cpp b/fastboot/usb_osx.c → fastboot/usb_osx.cpp
diff --git a/fastboot/util_osx.c → fastboot/util_osx.cpp b/fastboot/util_osx.c → fastboot/util_osx.cpp
@@ -26,6 +26,8 @@
  * SUCH DAMAGE.
  */
 
+#include "fastboot.h"
+
 #import <Carbon/Carbon.h>
 #include <unistd.h>