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

Side by Side Diff: chromeos/chromeos.gyp

Issue 11299236: This moves the ONC parsing code into chromeos/network/onc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit tests Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « chromeos/DEPS ('k') | chromeos/chromeos_test_utils.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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': 'chromeos', 11 'target_name': 'chromeos',
12 'type': '<(component)', 12 'type': '<(component)',
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 '../build/linux/system.gyp:ssl',
16 '../dbus/dbus.gyp:dbus', 17 '../dbus/dbus.gyp:dbus',
17 '../net/net.gyp:net', 18 '../net/net.gyp:net',
18 '../third_party/libxml/libxml.gyp:libxml', 19 '../third_party/libxml/libxml.gyp:libxml',
19 'power_manager_proto', 20 'power_manager_proto',
20 'power_state_control_proto', 21 'power_state_control_proto',
21 'power_supply_properties_proto', 22 'power_supply_properties_proto',
22 'video_activity_update_proto', 23 'video_activity_update_proto',
23 ], 24 ],
24 'defines': [ 25 'defines': [
25 'CHROMEOS_IMPLEMENTATION', 26 'CHROMEOS_IMPLEMENTATION',
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 'network/network_handler_callbacks.cc', 136 'network/network_handler_callbacks.cc',
136 'network/network_handler_callbacks.h', 137 'network/network_handler_callbacks.h',
137 'network/network_sms_handler.cc', 138 'network/network_sms_handler.cc',
138 'network/network_sms_handler.h', 139 'network/network_sms_handler.h',
139 'network/network_state.cc', 140 'network/network_state.cc',
140 'network/network_state.h', 141 'network/network_state.h',
141 'network/network_state_handler.cc', 142 'network/network_state_handler.cc',
142 'network/network_state_handler.h', 143 'network/network_state_handler.h',
143 'network/network_state_handler_observer.cc', 144 'network/network_state_handler_observer.cc',
144 'network/network_state_handler_observer.h', 145 'network/network_state_handler_observer.h',
146 'network/onc/onc_certificate_importer.cc',
147 'network/onc/onc_certificate_importer.h',
148 'network/onc/onc_constants.cc',
149 'network/onc/onc_constants.h',
150 'network/onc/onc_mapper.cc',
151 'network/onc/onc_mapper.h',
152 'network/onc/onc_merger.cc',
153 'network/onc/onc_merger.h',
154 'network/onc/onc_normalizer.cc',
155 'network/onc/onc_normalizer.h',
156 'network/onc/onc_signature.cc',
157 'network/onc/onc_signature.h',
158 'network/onc/onc_translation_tables.cc',
159 'network/onc/onc_translation_tables.h',
160 'network/onc/onc_translator.h',
161 'network/onc/onc_translator_onc_to_shill.cc',
162 'network/onc/onc_translator_shill_to_onc.cc',
163 'network/onc/onc_utils.cc',
164 'network/onc/onc_utils.h',
165 'network/onc/onc_validator.cc',
166 'network/onc/onc_validator.h',
145 'network/shill_property_handler.cc', 167 'network/shill_property_handler.cc',
146 'network/shill_property_handler.h', 168 'network/shill_property_handler.h',
147 'network/shill_service_observer.cc', 169 'network/shill_service_observer.cc',
148 'network/shill_service_observer.h', 170 'network/shill_service_observer.h',
149 'power/power_state_override.cc', 171 'power/power_state_override.cc',
150 'power/power_state_override.h', 172 'power/power_state_override.h',
151 ], 173 ],
152 'link_settings': { 174 'link_settings': {
153 'libraries': [ 175 'libraries': [
154 '-lXext', 176 '-lXext',
155 '-lXrandr', 177 '-lXrandr',
156 ], 178 ],
157 }, 179 },
158 }, 180 },
159 { 181 {
160 # This target contains mocks that can be used to write unit tests. 182 # This target contains mocks that can be used to write unit tests.
161 'target_name': 'chromeos_test_support', 183 'target_name': 'chromeos_test_support',
162 'type': 'static_library', 184 'type': 'static_library',
163 'dependencies': [ 185 'dependencies': [
164 '../build/linux/system.gyp:dbus', 186 '../build/linux/system.gyp:dbus',
165 '../testing/gmock.gyp:gmock', 187 '../testing/gmock.gyp:gmock',
166 'chromeos', 188 'chromeos',
167 ], 189 ],
168 'sources': [ 190 'sources': [
191 'chromeos_test_utils.cc',
192 'chromeos_test_utils.h',
169 'cryptohome/mock_async_method_caller.cc', 193 'cryptohome/mock_async_method_caller.cc',
170 'cryptohome/mock_async_method_caller.h', 194 'cryptohome/mock_async_method_caller.h',
171 'dbus/mock_bluetooth_adapter_client.cc', 195 'dbus/mock_bluetooth_adapter_client.cc',
172 'dbus/mock_bluetooth_adapter_client.h', 196 'dbus/mock_bluetooth_adapter_client.h',
173 'dbus/mock_bluetooth_device_client.cc', 197 'dbus/mock_bluetooth_device_client.cc',
174 'dbus/mock_bluetooth_device_client.h', 198 'dbus/mock_bluetooth_device_client.h',
175 'dbus/mock_bluetooth_input_client.cc', 199 'dbus/mock_bluetooth_input_client.cc',
176 'dbus/mock_bluetooth_input_client.h', 200 'dbus/mock_bluetooth_input_client.h',
177 'dbus/mock_bluetooth_manager_client.cc', 201 'dbus/mock_bluetooth_manager_client.cc',
178 'dbus/mock_bluetooth_manager_client.h', 202 'dbus/mock_bluetooth_manager_client.h',
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 '..', 280 '..',
257 ], 281 ],
258 }, 282 },
259 { 283 {
260 'target_name': 'chromeos_unittests', 284 'target_name': 'chromeos_unittests',
261 'type': 'executable', 285 'type': 'executable',
262 'dependencies': [ 286 'dependencies': [
263 '../base/base.gyp:run_all_unittests', 287 '../base/base.gyp:run_all_unittests',
264 '../base/base.gyp:test_support_base', 288 '../base/base.gyp:test_support_base',
265 '../build/linux/system.gyp:dbus', 289 '../build/linux/system.gyp:dbus',
290 '../build/linux/system.gyp:ssl',
291 '../crypto/crypto.gyp:crypto',
266 '../dbus/dbus.gyp:dbus_test_support', 292 '../dbus/dbus.gyp:dbus_test_support',
293 '../net/net.gyp:net',
267 '../testing/gmock.gyp:gmock', 294 '../testing/gmock.gyp:gmock',
268 '../testing/gtest.gyp:gtest', 295 '../testing/gtest.gyp:gtest',
269 'chromeos_test_support', 296 'chromeos_test_support',
270 ], 297 ],
271 'sources': [ 298 'sources': [
272 'display/output_configurator_unittest.cc', 299 'display/output_configurator_unittest.cc',
273 'dbus/blocking_method_caller_unittest.cc', 300 'dbus/blocking_method_caller_unittest.cc',
274 'dbus/shill_client_unittest_base.cc', 301 'dbus/shill_client_unittest_base.cc',
275 'dbus/shill_client_unittest_base.h', 302 'dbus/shill_client_unittest_base.h',
276 'dbus/shill_device_client_unittest.cc', 303 'dbus/shill_device_client_unittest.cc',
(...skipping 14 matching lines...) Expand all
291 'dbus/ibus/ibus_panel_service_unittest.cc', 318 'dbus/ibus/ibus_panel_service_unittest.cc',
292 'dbus/ibus/ibus_property_unittest.cc', 319 'dbus/ibus/ibus_property_unittest.cc',
293 'dbus/ibus/ibus_text_unittest.cc', 320 'dbus/ibus/ibus_text_unittest.cc',
294 'dbus/introspectable_client_unittest.cc', 321 'dbus/introspectable_client_unittest.cc',
295 'dbus/modem_messaging_client_unittest.cc', 322 'dbus/modem_messaging_client_unittest.cc',
296 'disks/disk_mount_manager_unittest.cc', 323 'disks/disk_mount_manager_unittest.cc',
297 'network/network_configuration_handler_unittest.cc', 324 'network/network_configuration_handler_unittest.cc',
298 'network/network_event_log_unittest.cc', 325 'network/network_event_log_unittest.cc',
299 'network/network_sms_handler_unittest.cc', 326 'network/network_sms_handler_unittest.cc',
300 'network/network_state_handler_unittest.cc', 327 'network/network_state_handler_unittest.cc',
328 'network/onc/onc_certificate_importer_unittest.cc',
329 'network/onc/onc_merger_unittest.cc',
330 'network/onc/onc_normalizer_unittest.cc',
331 'network/onc/onc_test_utils.cc',
332 'network/onc/onc_test_utils.h',
333 'network/onc/onc_translator_unittest.cc',
334 'network/onc/onc_utils_unittest.cc',
335 'network/onc/onc_validator_unittest.cc',
301 'network/shill_property_handler_unittest.cc', 336 'network/shill_property_handler_unittest.cc',
302 'power/power_state_override_unittest.cc', 337 'power/power_state_override_unittest.cc',
303 ], 338 ],
304 'include_dirs': [ 339 'include_dirs': [
305 '..', 340 '..',
306 ], 341 ],
307 'conditions': [ 342 'conditions': [
308 [ 'linux_use_tcmalloc==1', { 343 [ 'linux_use_tcmalloc==1', {
309 'dependencies': [ 344 'dependencies': [
310 '../base/allocator/allocator.gyp:allocator', 345 '../base/allocator/allocator.gyp:allocator',
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 '../third_party/cros_system_api/dbus/video_activity_update.proto', 400 '../third_party/cros_system_api/dbus/video_activity_update.proto',
366 ], 401 ],
367 'variables': { 402 'variables': {
368 'proto_in_dir': '../third_party/cros_system_api/dbus/', 403 'proto_in_dir': '../third_party/cros_system_api/dbus/',
369 'proto_out_dir': 'chromeos/dbus', 404 'proto_out_dir': 'chromeos/dbus',
370 }, 405 },
371 'includes': ['../build/protoc.gypi'], 406 'includes': ['../build/protoc.gypi'],
372 }, 407 },
373 ], 408 ],
374 } 409 }
OLDNEW
« no previous file with comments | « chromeos/DEPS ('k') | chromeos/chromeos_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698