commit f2879ef61453c845e2f675011e0cbc41d1396040
author Tim Murray <timmurray@google.com> Fri Jul 25 02:20:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 25 02:20:28 2014 +0000
tree 88a11103f7e4f6885fb497cf71a0a13a23764c04
parent d8c3038b5036d3f95781d3eab728758fff61c54a
parent 6698ebf92857b7a390264b36603c57ae639b43a2

am 6698ebf9: Merge "Fix Darwin build caused by -Wunused-parameter."

* commit '6698ebf92857b7a390264b36603c57ae639b43a2':
  Fix Darwin build caused by -Wunused-parameter.

libutils/Android.mk

diff --git a/libutils/Android.mk b/libutils/Android.mk
index 6164c10..2d77ef2 100644
--- a/libutils/Android.mk
+++ b/libutils/Android.mk
@@ -66,6 +66,9 @@
 ifeq ($(HOST_OS), linux)
 LOCAL_SRC_FILES += Looper.cpp
 endif
+ifeq ($(HOST_OS),darwin)
+LOCAL_CFLAGS += -Wno-unused-parameter
+endif
 LOCAL_MODULE:= libutils
 LOCAL_STATIC_LIBRARIES := liblog
 LOCAL_CFLAGS += $(host_commonCflags)