OLD | NEW |
---|---|
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 { |
(...skipping 12 matching lines...) Expand all Loading... | |
23 'exported_object.cc', | 23 'exported_object.cc', |
24 'exported_object.h', | 24 'exported_object.h', |
25 'message.cc', | 25 'message.cc', |
26 'message.h', | 26 'message.h', |
27 'object_proxy.cc', | 27 'object_proxy.cc', |
28 'object_proxy.h', | 28 'object_proxy.h', |
29 'scoped_dbus_error.h', | 29 'scoped_dbus_error.h', |
30 ], | 30 ], |
31 }, | 31 }, |
32 { | 32 { |
33 # Protobuf compiler / generator test protocol buffer | |
34 'target_name': 'dbus_test_proto', | |
35 'type': 'static_library', | |
36 'sources': [ 'test_proto.proto' ], | |
satorux1
2012/02/01 19:14:57
I don't see it in this patch. Did you forget to in
rharrison
2012/02/01 21:33:21
Yes, yes I did
| |
37 'variables': { | |
38 'proto_out_dir': 'dbus', | |
39 }, | |
40 'includes': [ '../build/protoc.gypi' ], | |
41 }, | |
42 { | |
33 # This target contains mocks that can be used to write unit tests | 43 # This target contains mocks that can be used to write unit tests |
34 # without issuing actual D-Bus calls. | 44 # without issuing actual D-Bus calls. |
35 'target_name': 'dbus_test_support', | 45 'target_name': 'dbus_test_support', |
36 'type': 'static_library', | 46 'type': 'static_library', |
37 'dependencies': [ | 47 'dependencies': [ |
38 '../build/linux/system.gyp:dbus', | 48 '../build/linux/system.gyp:dbus', |
39 '../testing/gmock.gyp:gmock', | 49 '../testing/gmock.gyp:gmock', |
satorux1
2012/02/01 19:14:57
Please add a dependency to the protobuf libe here.
| |
40 'dbus', | 50 'dbus', |
41 ], | 51 ], |
42 'sources': [ | 52 'sources': [ |
43 'mock_bus.cc', | 53 'mock_bus.cc', |
44 'mock_bus.h', | 54 'mock_bus.h', |
45 'mock_exported_object.cc', | 55 'mock_exported_object.cc', |
46 'mock_exported_object.h', | 56 'mock_exported_object.h', |
47 'mock_object_proxy.cc', | 57 'mock_object_proxy.cc', |
48 'mock_object_proxy.h', | 58 'mock_object_proxy.h', |
49 ], | 59 ], |
50 'include_dirs': [ | 60 'include_dirs': [ |
51 '..', | 61 '..', |
52 ], | 62 ], |
53 }, | 63 }, |
54 { | 64 { |
55 'target_name': 'dbus_unittests', | 65 'target_name': 'dbus_unittests', |
56 'type': 'executable', | 66 'type': 'executable', |
57 'dependencies': [ | 67 'dependencies': [ |
58 '../base/base.gyp:test_support_base', | 68 '../base/base.gyp:test_support_base', |
59 '../build/linux/system.gyp:dbus', | 69 '../build/linux/system.gyp:dbus', |
60 '../testing/gmock.gyp:gmock', | 70 '../testing/gmock.gyp:gmock', |
61 '../testing/gtest.gyp:gtest', | 71 '../testing/gtest.gyp:gtest', |
satorux1
2012/02/01 19:14:57
You probably need to add a dependency to the proto
rharrison
2012/02/01 21:33:21
Done.
| |
62 'dbus', | 72 'dbus', |
73 'dbus_test_proto', | |
63 'dbus_test_support', | 74 'dbus_test_support', |
64 ], | 75 ], |
65 'sources': [ | 76 'sources': [ |
66 '../base/test/run_all_unittests.cc', | 77 '../base/test/run_all_unittests.cc', |
67 'bus_unittest.cc', | 78 'bus_unittest.cc', |
68 'end_to_end_async_unittest.cc', | 79 'end_to_end_async_unittest.cc', |
69 'end_to_end_sync_unittest.cc', | 80 'end_to_end_sync_unittest.cc', |
70 'message_unittest.cc', | 81 'message_unittest.cc', |
71 'mock_unittest.cc', | 82 'mock_unittest.cc', |
72 'test_service.cc', | 83 'test_service.cc', |
73 'test_service.h', | 84 'test_service.h', |
74 ], | 85 ], |
75 'include_dirs': [ | 86 'include_dirs': [ |
76 '..', | 87 '..', |
77 ], | 88 ], |
78 }, | 89 }, |
79 ], | 90 ], |
80 } | 91 } |
OLD | NEW |