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

2015-06-24 19:29:20 +00:00 · 2015-06-24 19:29:20 +00:00 · feddd582e7
parent 2e8d31f6a1 20750ad823
commit feddd582e7
3 changed files with 3 additions and 1 deletions
--- 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
--- a/fastboot/usb_osx.cpp
+++ b/fastboot/usb_osx.cpp
--- a/fastboot/util_osx.cpp
+++ b/fastboot/util_osx.cpp
@ -26,6 +26,8 @@
 * SUCH DAMAGE.
 */

+#include "fastboot.h"
+
 #import <Carbon/Carbon.h>
 #include <unistd.h>