Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Side by Side Diff: dbus/dbus.gyp

Issue 9315006: Adding support for sending/receiving proto bufs to dbus library. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Added in the DEPS file as suggested Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « dbus/DEPS ('k') | dbus/message.h » ('j') | dbus/test_proto.proto » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'dbus', 11 'target_name': 'dbus',
12 'type': 'static_library', 12 'type': 'static_library',
13 'dependencies': [ 13 'dependencies': [
14 '../base/base.gyp:base', 14 '../base/base.gyp:base',
15 '../build/linux/system.gyp:dbus', 15 '../build/linux/system.gyp:dbus',
16 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
16 ], 17 ],
17 'export_dependent_settings': [ 18 'export_dependent_settings': [
18 '../base/base.gyp:base', 19 '../base/base.gyp:base',
19 ], 20 ],
20 'sources': [ 21 'sources': [
21 'bus.cc', 22 'bus.cc',
22 'bus.h', 23 'bus.h',
23 'exported_object.cc', 24 'exported_object.cc',
24 'exported_object.h', 25 'exported_object.h',
25 'message.cc', 26 'message.cc',
26 'message.h', 27 'message.h',
27 'object_proxy.cc', 28 'object_proxy.cc',
28 'object_proxy.h', 29 'object_proxy.h',
29 'scoped_dbus_error.h', 30 'scoped_dbus_error.h',
30 ], 31 ],
31 }, 32 },
32 { 33 {
34 # Protobuf compiler / generator test protocol buffer
35 'target_name': 'dbus_test_proto',
36 'type': 'static_library',
37 'sources': [ 'test_proto.proto' ],
38 'variables': {
39 'proto_out_dir': 'dbus',
40 },
41 'includes': [ '../build/protoc.gypi' ],
42 },
43 {
33 # This target contains mocks that can be used to write unit tests 44 # This target contains mocks that can be used to write unit tests
34 # without issuing actual D-Bus calls. 45 # without issuing actual D-Bus calls.
35 'target_name': 'dbus_test_support', 46 'target_name': 'dbus_test_support',
36 'type': 'static_library', 47 'type': 'static_library',
37 'dependencies': [ 48 'dependencies': [
38 '../build/linux/system.gyp:dbus', 49 '../build/linux/system.gyp:dbus',
39 '../testing/gmock.gyp:gmock', 50 '../testing/gmock.gyp:gmock',
40 'dbus', 51 'dbus',
41 ], 52 ],
42 'sources': [ 53 'sources': [
(...skipping 10 matching lines...) Expand all
53 }, 64 },
54 { 65 {
55 'target_name': 'dbus_unittests', 66 'target_name': 'dbus_unittests',
56 'type': 'executable', 67 'type': 'executable',
57 'dependencies': [ 68 'dependencies': [
58 '../base/base.gyp:test_support_base', 69 '../base/base.gyp:test_support_base',
59 '../build/linux/system.gyp:dbus', 70 '../build/linux/system.gyp:dbus',
60 '../testing/gmock.gyp:gmock', 71 '../testing/gmock.gyp:gmock',
61 '../testing/gtest.gyp:gtest', 72 '../testing/gtest.gyp:gtest',
62 'dbus', 73 'dbus',
74 'dbus_test_proto',
63 'dbus_test_support', 75 'dbus_test_support',
64 ], 76 ],
65 'sources': [ 77 'sources': [
66 '../base/test/run_all_unittests.cc', 78 '../base/test/run_all_unittests.cc',
67 'bus_unittest.cc', 79 'bus_unittest.cc',
68 'end_to_end_async_unittest.cc', 80 'end_to_end_async_unittest.cc',
69 'end_to_end_sync_unittest.cc', 81 'end_to_end_sync_unittest.cc',
70 'message_unittest.cc', 82 'message_unittest.cc',
71 'mock_unittest.cc', 83 'mock_unittest.cc',
72 'test_service.cc', 84 'test_service.cc',
73 'test_service.h', 85 'test_service.h',
74 ], 86 ],
75 'include_dirs': [ 87 'include_dirs': [
76 '..', 88 '..',
77 ], 89 ],
78 }, 90 },
79 ], 91 ],
80 } 92 }
OLDNEW
« no previous file with comments | « dbus/DEPS ('k') | dbus/message.h » ('j') | dbus/test_proto.proto » ('J')

Powered by Google App Engine
This is Rietveld 408576698