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

Side by Side Diff: chromeos/chromeos.gyp

Issue 25112004: Move statistics_provider to chromeos/system (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, fix DeviceManagement Created 7 years, 2 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 | Annotate | Revision Log
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 'includes': [ 9 'includes': [
10 'chromeos_memory.gypi', 10 'chromeos_memory.gypi',
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 'network/dhcp_proxy_script_fetcher_chromeos.cc', 300 'network/dhcp_proxy_script_fetcher_chromeos.cc',
301 'network/dhcp_proxy_script_fetcher_chromeos.h', 301 'network/dhcp_proxy_script_fetcher_chromeos.h',
302 'process_proxy/process_output_watcher.cc', 302 'process_proxy/process_output_watcher.cc',
303 'process_proxy/process_output_watcher.h', 303 'process_proxy/process_output_watcher.h',
304 'process_proxy/process_proxy.cc', 304 'process_proxy/process_proxy.cc',
305 'process_proxy/process_proxy.h', 305 'process_proxy/process_proxy.h',
306 'process_proxy/process_proxy_registry.cc', 306 'process_proxy/process_proxy_registry.cc',
307 'process_proxy/process_proxy_registry.h', 307 'process_proxy/process_proxy_registry.h',
308 'system/name_value_pairs_parser.cc', 308 'system/name_value_pairs_parser.cc',
309 'system/name_value_pairs_parser.h', 309 'system/name_value_pairs_parser.h',
310 'system/statistics_provider.cc',
311 'system/statistics_provider.h',
310 ], 312 ],
311 'conditions': [ 313 'conditions': [
312 ['use_x11 == 1', { 314 ['use_x11 == 1', {
313 'dependencies': [ 315 'dependencies': [
314 '../build/linux/system.gyp:glib', 316 '../build/linux/system.gyp:glib',
315 ], 317 ],
316 'link_settings': { 318 'link_settings': {
317 'libraries': [ 319 'libraries': [
318 '-lX11', 320 '-lX11',
319 '-lXext', 321 '-lXext',
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 'disks/mock_disk_mount_manager.cc', 383 'disks/mock_disk_mount_manager.cc',
382 'disks/mock_disk_mount_manager.h', 384 'disks/mock_disk_mount_manager.h',
383 'ime/mock_component_extension_ime_manager_delegate.cc', 385 'ime/mock_component_extension_ime_manager_delegate.cc',
384 'ime/mock_component_extension_ime_manager_delegate.h', 386 'ime/mock_component_extension_ime_manager_delegate.h',
385 'network/mock_managed_network_configuration_handler.cc', 387 'network/mock_managed_network_configuration_handler.cc',
386 'network/mock_managed_network_configuration_handler.h', 388 'network/mock_managed_network_configuration_handler.h',
387 'network/onc/mock_certificate_importer.cc', 389 'network/onc/mock_certificate_importer.cc',
388 'network/onc/mock_certificate_importer.h', 390 'network/onc/mock_certificate_importer.h',
389 'network/onc/onc_test_utils.cc', 391 'network/onc/onc_test_utils.cc',
390 'network/onc/onc_test_utils.h', 392 'network/onc/onc_test_utils.h',
393 'system/mock_statistics_provider.cc',
394 'system/mock_statistics_provider.h',
391 ], 395 ],
392 'include_dirs': [ 396 'include_dirs': [
393 '..', 397 '..',
394 ], 398 ],
395 }, 399 },
396 { 400 {
397 'target_name': 'chromeos_test_support_without_gmock', 401 'target_name': 'chromeos_test_support_without_gmock',
398 'type': 'static_library', 402 'type': 'static_library',
399 'dependencies': [ 403 'dependencies': [
400 '../build/linux/system.gyp:dbus', 404 '../build/linux/system.gyp:dbus',
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 '../third_party/cros_system_api/dbus/power_manager/suspend.proto', 549 '../third_party/cros_system_api/dbus/power_manager/suspend.proto',
546 ], 550 ],
547 'variables': { 551 'variables': {
548 'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager', 552 'proto_in_dir': '../third_party/cros_system_api/dbus/power_manager',
549 'proto_out_dir': 'chromeos/dbus/power_manager', 553 'proto_out_dir': 'chromeos/dbus/power_manager',
550 }, 554 },
551 'includes': ['../build/protoc.gypi'], 555 'includes': ['../build/protoc.gypi'],
552 }, 556 },
553 ], 557 ],
554 } 558 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698