commit 6ebaf311a7af8d20979deba279f9d5096ed8f193
author Tim Murray <timmurray@google.com> Fri Jul 25 02:20:30 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 25 02:20:30 2014 +0000
tree a04c5c2799787738d94e045696e6aeda7fea8580
parent 6a223baf956168893d4b7412852c6836efa4a6ff
parent 721f189a0571ab51388c8a223f343f3da78f28df

am 721f189a: Merge "fix adb build on Darwin"

* commit '721f189a0571ab51388c8a223f343f3da78f28df':
  fix adb build on Darwin

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 80427b8..80c1f9c 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -24,6 +24,7 @@
   USB_SRCS := usb_osx.c
   EXTRA_SRCS := get_my_path_darwin.c
   LOCAL_LDLIBS += -lpthread -framework CoreFoundation -framework IOKit -framework Carbon
+  LOCAL_CFLAGS += -Wno-sizeof-pointer-memaccess -Wno-unused-parameter
 endif
 
 ifeq ($(HOST_OS),freebsd)