Merge "Minor build cleanup."
diff --git a/bus/Android.mk b/bus/Android.mk
index f14b64d..3da183e 100644
--- a/bus/Android.mk
+++ b/bus/Android.mk
@@ -1,29 +1,25 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_C_INCLUDES:= \
- $(LOCAL_PATH)/.. \
- $(LOCAL_PATH)/../dbus \
- external/expat/lib/
+LOCAL_C_INCLUDES:= $(LOCAL_PATH)/..
-LOCAL_CFLAGS:=-O3
-LOCAL_CFLAGS+=-DDBUS_COMPILATION
-#LOCAL_CFLAGS+=-DDBUS_MACHINE_UUID_FILE=\"/system/etc/machine-id\"
-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_CFLAGS:= \
+ -O3 \
+ -DDBUS_COMPILATION \
+ -DDBUS_DAEMON_NAME=\"dbus-daemon\" \
+ -DDBUS_SYSTEM_CONFIG_FILE=\"/system/etc/dbus.conf\" \
+ -DDBUS_SESSION_CONFIG_FILE=\"/system/etc/session.conf\" \
+ -Wno-address \
+ -Wno-empty-body \
+ -Wno-pointer-sign \
+ -Wno-unused-parameter
LOCAL_SRC_FILES:= \
activation.c \
bus.c \
config-loader-expat.c \
config-parser.c \
- config-parser-common.c \
+ config-parser-common.c \
connection.c \
desktop-file.c \
dir-watch-default.c \
diff --git a/dbus/Android.mk b/dbus/Android.mk
index 0fefec6..0d38aea 100644
--- a/dbus/Android.mk
+++ b/dbus/Android.mk
@@ -6,69 +6,77 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
-dbus-address.c \
-dbus-auth.c \
-dbus-bus.c \
-dbus-connection.c \
-dbus-credentials.c \
-dbus-dataslot.c \
-dbus-errors.c \
-dbus-file.c \
-dbus-file-unix.c \
-dbus-hash.c \
-dbus-internals.c \
-dbus-keyring.c \
-dbus-list.c \
-dbus-mainloop.c \
-dbus-marshal-basic.c \
-dbus-marshal-byteswap.c \
-dbus-marshal-header.c \
-dbus-marshal-recursive.c \
-dbus-marshal-validate.c \
-dbus-mempool.c \
-dbus-memory.c \
-dbus-message.c \
-dbus-nonce.c \
-dbus-pending-call.c \
-dbus-pipe.c \
-dbus-pipe-unix.c \
-dbus-resources.c \
-dbus-server.c \
-dbus-server-socket.c \
-dbus-server-unix.c \
-dbus-sha.c \
-dbus-shell.c \
-dbus-signature.c \
-dbus-spawn.c \
-dbus-string.c \
-dbus-string-util.c \
-dbus-sysdeps.c \
-dbus-sysdeps-pthread.c \
-dbus-sysdeps-unix.c \
-dbus-sysdeps-util-unix.c \
-dbus-timeout.c \
-dbus-threads.c \
-dbus-transport.c \
-dbus-transport-socket.c \
-dbus-transport-unix.c \
-dbus-object-tree.c \
-dbus-userdb.c \
-dbus-userdb-util.c \
-dbus-watch.c \
-sd-daemon.c \
+ dbus-address.c \
+ dbus-auth.c \
+ dbus-bus.c \
+ dbus-connection.c \
+ dbus-credentials.c \
+ dbus-dataslot.c \
+ dbus-errors.c \
+ dbus-file.c \
+ dbus-file-unix.c \
+ dbus-hash.c \
+ dbus-internals.c \
+ dbus-keyring.c \
+ dbus-list.c \
+ dbus-mainloop.c \
+ dbus-marshal-basic.c \
+ dbus-marshal-byteswap.c \
+ dbus-marshal-header.c \
+ dbus-marshal-recursive.c \
+ dbus-marshal-validate.c \
+ dbus-mempool.c \
+ dbus-memory.c \
+ dbus-message.c \
+ dbus-nonce.c \
+ dbus-pending-call.c \
+ dbus-pipe.c \
+ dbus-pipe-unix.c \
+ dbus-resources.c \
+ dbus-server.c \
+ dbus-server-socket.c \
+ dbus-server-unix.c \
+ dbus-sha.c \
+ dbus-shell.c \
+ dbus-signature.c \
+ dbus-spawn.c \
+ dbus-string.c \
+ dbus-string-util.c \
+ dbus-sysdeps.c \
+ dbus-sysdeps-pthread.c \
+ dbus-sysdeps-unix.c \
+ dbus-sysdeps-util-unix.c \
+ dbus-timeout.c \
+ dbus-threads.c \
+ dbus-transport.c \
+ dbus-transport-socket.c \
+ dbus-transport-unix.c \
+ dbus-object-tree.c \
+ dbus-userdb.c \
+ dbus-userdb-util.c \
+ dbus-watch.c \
+ sd-daemon.c
LOCAL_C_INCLUDES+= $(LOCAL_PATH)/..
LOCAL_MODULE:=libdbus
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+
LOCAL_CFLAGS+= \
-DDBUS_COMPILATION \
-DANDROID_MANAGED_SOCKET \
- -DANDROID_ATOMIC \
+ -DANDROID_ATOMIC \
-DDBUS_MACHINE_UUID_FILE=\"/etc/machine-id\" \
- -DDBUS_SYSTEM_CONFIG_FILE=\"/system/etc/dbus.conf\" \
- -DDBUS_SESSION_CONFIG_FILE=\"/system/etc/session.conf\"
-
+ -DDBUS_SYSTEM_CONFIG_FILE=\"/system/etc/dbus.conf\" \
+ -DDBUS_SESSION_CONFIG_FILE=\"/system/etc/session.conf\" \
+ -Wno-empty-body \
+ -Wno-missing-field-initializers \
+ -Wno-pointer-sign \
+ -Wno-sign-compare \
+ -Wno-tautological-compare \
+ -Wno-type-limits \
+ -Wno-unused-parameter
ifeq ($(LOG_TO_ANDROID_LOGCAT),true)
LOCAL_CFLAGS+= -DDBUS_ANDROID_LOG
diff --git a/tools/Android.mk b/tools/Android.mk
index d2067f6..a5a56df 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -1,15 +1,20 @@
LOCAL_PATH := $(call my-dir)
+dbusToolsCommonCIncludes := $(LOCAL_PATH)/..
+dbusToolsCommonCFlags := \
+ -DDBUS_COMPILATION \
+ -DDBUS_MACHINE_UUID_FILE=\"/etc/machine-id\" \
+ -Wno-unused-parameter
+dbusToolsCommonSharedLibraries := libdbus
+
# common
include $(CLEAR_VARS)
LOCAL_SRC_FILES := dbus-print-message.c
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-LOCAL_SHARED_LIBRARIES += libdbus
-LOCAL_CFLAGS += \
- -DDBUS_COMPILATION \
- -DDBUS_MACHINE_UUID_FILE=\"/etc/machine-id\"
+LOCAL_C_INCLUDES += $(dbusToolsCommonCIncludes)
+LOCAL_SHARED_LIBRARIES += $(dbusToolsCommonSharedLibraries)
+LOCAL_CFLAGS += $(dbusToolsCommonCFlags)
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
LOCAL_MODULE := libdbus-tools-common
@@ -20,12 +25,10 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := dbus-monitor.c
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-LOCAL_SHARED_LIBRARIES += libdbus
+LOCAL_C_INCLUDES += $(dbusToolsCommonCIncludes)
+LOCAL_SHARED_LIBRARIES += $(dbusToolsCommonSharedLibraries)
LOCAL_STATIC_LIBRARIES += libdbus-tools-common
-LOCAL_CFLAGS += \
- -DDBUS_COMPILATION \
- -DDBUS_MACHINE_UUID_FILE=\"/etc/machine-id\"
+LOCAL_CFLAGS += $(dbusToolsCommonCFlags)
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
LOCAL_MODULE := dbus-monitor
@@ -36,12 +39,10 @@
include $(CLEAR_VARS)
LOCAL_SRC_FILES := dbus-send.c
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-LOCAL_SHARED_LIBRARIES += libdbus
+LOCAL_C_INCLUDES += $(dbusToolsCommonCIncludes)
+LOCAL_SHARED_LIBRARIES += $(dbusToolsCommonSharedLibraries)
LOCAL_STATIC_LIBRARIES += libdbus-tools-common
-LOCAL_CFLAGS += \
- -DDBUS_COMPILATION \
- -DDBUS_MACHINE_UUID_FILE=\"/etc/machine-id\"
+LOCAL_CFLAGS += $(dbusToolsCommonCFlags)
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := eng
LOCAL_MODULE := dbus-send
