Add CrOS's dbus-c++ to Chromium Linux. This is needed to build mtpd.

BUG=151685

Review URL: https://chromiumcodereview.appspot.com/11148035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162373 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 87 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index 40f4d0e..18ad002 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,6 +156,7 @@ v8.log
 /third_party/chromeos_login_manager
 /third_party/chromeos_text_input
 /third_party/cros
+/third_party/cros_dbus_cplusplus/source
 /third_party/cros_system_api
 /third_party/cygwin
 /third_party/directxsdk
diff --git a/DEPS b/DEPS
index c40293d..8b63a79 100644
--- a/DEPS
+++ b/DEPS
@@ -525,6 +525,11 @@ deps_os = {
     "src/third_party/libmtp":
       "/trunk/deps/third_party/libmtp@160216",
 
+    # Used on Linux only. CrOS already has a copy.
+    "src/third_party/cros_dbus_cplusplus/source":
+      Var("chromiumos_git") + "/third_party/dbus-cplusplus.git" +
+      "@5e8f6d9db5c2abfb91d91f751184f25bb5cd0900",
+
     # For Linux and Chromium OS.
     "src/third_party/cros_system_api":
       Var("chromiumos_git") + "/platform/system_api.git" +
diff --git a/build/all.gyp b/build/all.gyp
index f473dd7..e7b50dd 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -97,6 +97,11 @@
                 '../chrome/chrome.gyp:linux_packages_<(channel)',
               ],
             }],
+            ['chromeos==0', {
+              'dependencies': [
+                '../third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp:*',
+              ],
+            }],
           ],
         }],
         ['toolkit_uses_gtk==1', {
diff --git a/third_party/cros_dbus_cplusplus/README.chromium b/third_party/cros_dbus_cplusplus/README.chromium
new file mode 100644
index 0000000..0f3efb2
--- /dev/null
+++ b/third_party/cros_dbus_cplusplus/README.chromium
@@ -0,0 +1,9 @@
+Name: dbus-cplusplus
+URL: http://dbus-cplusplus.sourceforge.net/
+Version: Unknown
+License: LGPL 2.1
+License File: source/COPYING
+Security Critical: yes
+
+Description:
+ChromiumOS's fork of dbus-c++. See git log for list of modifications.
diff --git a/third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp b/third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp
new file mode 100644
index 0000000..9ac5ffc
--- /dev/null
+++ b/third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp
@@ -0,0 +1,58 @@
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# This is used to build parts of dbus-c++ in Chromium on Linux.
+# TODO(thestig) Add support for system dbus-c++ in the future if it becomes
+# compatible with the CrOS fork.
+{
+  'targets': [
+    {
+      'target_name': 'dbus_cplusplus',
+      'type': 'shared_library',
+      'dependencies': [
+        '../../build/linux/system.gyp:dbus',
+        '../../build/linux/system.gyp:glib',
+      ],
+      'sources': [
+        'source/src/connection.cpp',
+        'source/src/connection_p.h',
+        'source/src/debug.cpp',
+        'source/src/dispatcher.cpp',
+        'source/src/dispatcher_p.h',
+        'source/src/error.cpp',
+        'source/src/eventloop-integration.cpp',
+        'source/src/eventloop.cpp',
+        'source/src/glib-integration.cpp',
+        'source/src/interface.cpp',
+        'source/src/internalerror.h',
+        'source/src/introspection.cpp',
+        'source/src/message.cpp',
+        'source/src/message_p.h',
+        'source/src/object.cpp',
+        'source/src/pendingcall.cpp',
+        'source/src/pendingcall_p.h',
+        'source/src/property.cpp',
+        'source/src/server.cpp',
+        'source/src/server_p.h',
+        'source/src/types.cpp',
+      ],
+      'cflags!': [
+        '-fno-exceptions',
+        '-fvisibility=hidden',
+      ],
+      'defines': [
+        'DBUS_HAS_RECURSIVE_MUTEX',
+        'DBUS_HAS_THREADS_INIT_DEFAULT',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          'source/include',
+        ],
+      },
+      'include_dirs': [
+        'source/include',
+      ],
+    },
+  ],
+}
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index 195305f..ad494a5 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -190,6 +190,15 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
     'third_party/cld/encodings/compact_lang_det': [  # http://crbug.com/98120
         'UNKNOWN',
     ],
+    # Not used. http://crbug.com/156020
+    # Using third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp instead.
+    'third_party/cros_dbus_cplusplus/source/autogen.sh': [
+        'UNKNOWN',
+    ],
+    # Included in the source tree but not built. http://crbug.com/156020
+    'third_party/cros_dbus_cplusplus/source/examples': [
+        'UNKNOWN',
+    ],
     'third_party/devscripts': [
         'GPL (v2 or later)',
     ],