Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit feddd582 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

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

parents 2e8d31f6 20750ad8

fastboot/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

fastboot/usb_osx.c→fastboot/usb_osx.cpp

+0 −0

File moved.

View file

fastboot/util_osx.c→fastboot/util_osx.cpp

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
 * SUCH DAMAGE.

 */



#include "fastboot.h"



#import <Carbon/Carbon.h>

#include <unistd.h>