ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Elliott Hughes 2015-06-24 19:29:20 +00:00 • committed by Gerrit Code Review
commit feddd582e7
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fastboot/Android.mk
View file

@ -34,7 +34,7 @@ ifeq ($(HOST_OS),linux)
endif endif
ifeq ($(HOST_OS),darwin) 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_LDLIBS += -lpthread -framework CoreFoundation -framework IOKit -framework Carbon
LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_CFLAGS += -Wno-unused-parameter
endif endif

0
fastboot/usb_osx.c → fastboot/usb_osx.cpp
View file

2
fastboot/util_osx.c → fastboot/util_osx.cpp
View file

@ -26,6 +26,8 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#include "fastboot.h"
#import <Carbon/Carbon.h> #import <Carbon/Carbon.h>
#include <unistd.h> #include <unistd.h>