aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Kwan <dougkwan@google.com>2011-06-26 12:08:40 -0700
committerDoug Kwan <dougkwan@google.com>2011-06-26 12:08:40 -0700
commit6881a39384a9dea44aacbc315245c283f6ac75ca (patch)
tree6cd4c71df2ce2e0dccdb1961bc671346aea3a02c
parentf022f55d3ce46acf1fba3121642668c2b1262c72 (diff)
downloaddbus-6881a39384a9dea44aacbc315245c283f6ac75ca.tar.gz
Suppress gcc warning to make dbus compile using gcc-4.6. This is
done also by upstream in dbus-1.4.6. See: Change-Id: I01c1b54980896849c855e457456e95a69afe54e9 http://lists.freedesktop.org/archives/dbus/2011-February/014122.html
-rw-r--r--bus/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/bus/Android.mk b/bus/Android.mk
index 0af7bb60..4d5229d2 100644
--- a/bus/Android.mk
+++ b/bus/Android.mk
@@ -13,6 +13,10 @@ LOCAL_CFLAGS+=-DDBUS_DAEMON_NAME=\"dbus-daemon\"
LOCAL_CFLAGS+=-DDBUS_SYSTEM_CONFIG_FILE=\"/system/etc/dbus.conf\"
LOCAL_CFLAGS+=-DDBUS_SESSION_CONFIG_FILE=\"/system/etc/session.conf\"
+# We get warning in the _DBUS_ASSERT_ERROR_IS_SET macro. Suppress
+# this warning so that we can compile with Werror. The warning
+# is also ignored in dbus-1.4.6.
+LOCAL_CFLAGS+=-Wno-address
LOCAL_SRC_FILES:= \
activation.c \