Upgrade to version 1.4.0 and make it compile on Android.

Change-Id: I63dd55d9284e3384635262f2dde3e686a815c3da

5 files changed, 20 insertions, 8 deletions

diff --git a/ThirdPartyProject.prop b/ThirdPartyProject.prop
index be3da939..c2888ebd 100644
--- a/ThirdPartyProject.prop
+++ b/ThirdPartyProject.prop
@@ -1,7 +1,7 @@
 # Copyright 2010 Google Inc. All Rights Reserved.
-#Fri Jul 16 10:03:08 PDT 2010
-currentVersion=1.2.20 / 1.3.0
-version=1.0.2
+#Wed Oct 20 16:55:08 PDT 2010
+currentVersion=1.4.0
+version=1.4.0
 isNative=true
 feedurl=http\://www.freedesktop.org/wiki/Software/dbus    http\://lists.freedesktop.org/archives/dbus/2009-July/011574.html
 name=dbus
diff --git a/bus/Android.mk b/bus/Android.mk
index c17d6667..0af7bb60 100644
--- a/bus/Android.mk
+++ b/bus/Android.mk
@@ -9,7 +9,7 @@ LOCAL_C_INCLUDES:= \
 LOCAL_CFLAGS:=-O3
 LOCAL_CFLAGS+=-DDBUS_COMPILATION
 #LOCAL_CFLAGS+=-DDBUS_MACHINE_UUID_FILE=\"/system/etc/machine-id\"
-LOCAL_CFLAGS+=-DDAEMON_NAME=\"dbus-daemon\"
+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\"
 
@@ -19,6 +19,7 @@ LOCAL_SRC_FILES:= \
 	bus.c \
 	config-loader-expat.c \
 	config-parser.c \
+    config-parser-common.c \
 	connection.c \
 	desktop-file.c \
 	dir-watch-default.c \
diff --git a/bus/bus.c b/bus/bus.c
index 1be96a69..4c675618 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -869,7 +869,8 @@ bus_context_new (const DBusString *config_file,
       {
         if (!_dbus_become_daemon (NULL,
                                   0,
-                                  error))
+                                  error,
+                                  context->keep_umask))
           {
             _DBUS_ASSERT_ERROR_IS_SET (error);
             goto failed;
diff --git a/dbus/Android.mk b/dbus/Android.mk
index 2ff626cf..5847a5f5 100644
--- a/dbus/Android.mk
+++ b/dbus/Android.mk
@@ -12,8 +12,11 @@ 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 \
@@ -27,7 +30,10 @@ 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 \
@@ -50,7 +56,8 @@ dbus-transport-unix.c \
 dbus-object-tree.c \
 dbus-userdb.c \
 dbus-userdb-util.c \
-dbus-watch.c
+dbus-watch.c \
+sd-daemon.c \
 
 LOCAL_C_INCLUDES+= \
 	$(call include-path-for, dbus)
@@ -60,7 +67,10 @@ LOCAL_MODULE:=libdbus
 LOCAL_CFLAGS+= \
 	-DDBUS_COMPILATION \
 	-DANDROID_MANAGED_SOCKET \
-	-DDBUS_MACHINE_UUID_FILE=\"/etc/machine-id\"
+	-DDBUS_MACHINE_UUID_FILE=\"/etc/machine-id\" \
+    -DDBUS_SYSTEM_CONFIG_FILE=\"/system/etc/dbus.conf\" \
+    -DDBUS_SESSION_CONFIG_FILE=\"/system/etc/session.conf\"
+
 
 ifeq ($(LOG_TO_ANDROID_LOGCAT),true)
 LOCAL_CFLAGS+= -DDBUS_ANDROID_LOG
diff --git a/dbus/sd-daemon.c b/dbus/sd-daemon.c
index 9c23b917..8596961f 100644
--- a/dbus/sd-daemon.c
+++ b/dbus/sd-daemon.c
@@ -32,7 +32,7 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <errno.h>