summaryrefslogtreecommitdiffstats
path: root/fastboot
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2014-07-25 02:38:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-25 02:38:02 +0000
commitb2e13ae4fef5ae775eddf529923eb5c5ca87d847 (patch)
treedf22e98f8a3dcd0a3d83a1b5291e58df310861f2 /fastboot
parent2cc4fd73d100749f4154065e4884fc912db584a9 (diff)
parent3a5f3db2aa5324518eb71c69cd1fb3e2125cbd43 (diff)
downloadsystem_core-b2e13ae4fef5ae775eddf529923eb5c5ca87d847.zip
system_core-b2e13ae4fef5ae775eddf529923eb5c5ca87d847.tar.gz
system_core-b2e13ae4fef5ae775eddf529923eb5c5ca87d847.tar.bz2
am 3a5f3db2: am c894ced1: Merge "Fix fastboot for Darwin."
* commit '3a5f3db2aa5324518eb71c69cd1fb3e2125cbd43': Fix fastboot for Darwin.
Diffstat (limited to 'fastboot')
-rw-r--r--fastboot/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk
index 252db6c..d212b2c 100644
--- a/fastboot/Android.mk
+++ b/fastboot/Android.mk
@@ -32,6 +32,7 @@ ifeq ($(HOST_OS),darwin)
LOCAL_SRC_FILES += usb_osx.c util_osx.c
LOCAL_LDLIBS += -lpthread -framework CoreFoundation -framework IOKit \
-framework Carbon
+ LOCAL_CFLAGS += -Wno-unused-parameter
endif
ifeq ($(HOST_OS),windows)