summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 13:09:36 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-17 13:09:36 +0000
commit1f31e6fa1908b8417269b845b26006d22a8f19f0 (patch)
tree1432f7e76351ab8b1b4a4e584d5be1481ee068bb /third_party
parentb06c8c468526b1bd6305b0f9632b24474e184e9a (diff)
downloadchromium_src-1f31e6fa1908b8417269b845b26006d22a8f19f0.zip
chromium_src-1f31e6fa1908b8417269b845b26006d22a8f19f0.tar.gz
chromium_src-1f31e6fa1908b8417269b845b26006d22a8f19f0.tar.bz2
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
Diffstat (limited to 'third_party')
-rw-r--r--third_party/cros_dbus_cplusplus/README.chromium9
-rw-r--r--third_party/cros_dbus_cplusplus/cros_dbus_cplusplus.gyp58
2 files changed, 67 insertions, 0 deletions
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',
+ ],
+ },
+ ],
+}