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

Side by Side Diff: trunk/src/chromeos/chromeos.gyp

Issue 14642018: Revert 197960 "[chromeos] Remove dependencies of StatisticsProvi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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_tools.gypi' 10 'chromeos_tools.gypi'
(...skipping 12 matching lines...) Expand all
23 '../net/net.gyp:net', 23 '../net/net.gyp:net',
24 '../third_party/libxml/libxml.gyp:libxml', 24 '../third_party/libxml/libxml.gyp:libxml',
25 'ime/input_method.gyp:gencode', 25 'ime/input_method.gyp:gencode',
26 'power_manager_proto', 26 'power_manager_proto',
27 'video_activity_update_proto', 27 'video_activity_update_proto',
28 ], 28 ],
29 'defines': [ 29 'defines': [
30 'CHROMEOS_IMPLEMENTATION', 30 'CHROMEOS_IMPLEMENTATION',
31 ], 31 ],
32 'sources': [ 32 'sources': [
33 'app_mode/kiosk_oem_manifest_parser.cc',
34 'app_mode/kiosk_oem_manifest_parser.h',
35 'audio/audio_device.cc', 33 'audio/audio_device.cc',
36 'audio/audio_device.h', 34 'audio/audio_device.h',
37 'audio/audio_pref_observer.h', 35 'audio/audio_pref_observer.h',
38 'audio/audio_pref_handler.h', 36 'audio/audio_pref_handler.h',
39 'audio/cras_audio_handler.cc', 37 'audio/cras_audio_handler.cc',
40 'audio/cras_audio_handler.h', 38 'audio/cras_audio_handler.h',
41 'audio/mock_cras_audio_handler.cc', 39 'audio/mock_cras_audio_handler.cc',
42 'audio/mock_cras_audio_handler.h', 40 'audio/mock_cras_audio_handler.h',
43 'audio/cras_audio_switch_handler.cc', 41 'audio/cras_audio_switch_handler.cc',
44 'audio/cras_audio_switch_handler.h', 42 'audio/cras_audio_switch_handler.h',
45 'attestation/attestation_constants.cc', 43 'attestation/attestation_constants.cc',
46 'attestation/attestation_constants.h', 44 'attestation/attestation_constants.h',
47 'attestation/attestation_flow.cc', 45 'attestation/attestation_flow.cc',
48 'attestation/attestation_flow.h', 46 'attestation/attestation_flow.h',
49 'chromeos_constants.cc',
50 'chromeos_constants.h',
51 'chromeos_export.h', 47 'chromeos_export.h',
52 'chromeos_paths.cc', 48 'chromeos_paths.cc',
53 'chromeos_paths.h', 49 'chromeos_paths.h',
54 'chromeos_switches.cc', 50 'chromeos_switches.cc',
55 'chromeos_switches.h', 51 'chromeos_switches.h',
56 'cryptohome/async_method_caller.cc', 52 'cryptohome/async_method_caller.cc',
57 'cryptohome/async_method_caller.h', 53 'cryptohome/async_method_caller.h',
58 'cryptohome/cryptohome_library.cc', 54 'cryptohome/cryptohome_library.cc',
59 'cryptohome/cryptohome_library.h', 55 'cryptohome/cryptohome_library.h',
60 'dbus/audio_node.cc', 56 'dbus/audio_node.cc',
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 'network/shill_property_handler.cc', 285 'network/shill_property_handler.cc',
290 'network/shill_property_handler.h', 286 'network/shill_property_handler.h',
291 'network/sms_watcher.cc', 287 'network/sms_watcher.cc',
292 'network/sms_watcher.h', 288 'network/sms_watcher.h',
293 'process_proxy/process_output_watcher.cc', 289 'process_proxy/process_output_watcher.cc',
294 'process_proxy/process_output_watcher.h', 290 'process_proxy/process_output_watcher.h',
295 'process_proxy/process_proxy.cc', 291 'process_proxy/process_proxy.cc',
296 'process_proxy/process_proxy.h', 292 'process_proxy/process_proxy.h',
297 'process_proxy/process_proxy_registry.cc', 293 'process_proxy/process_proxy_registry.cc',
298 'process_proxy/process_proxy_registry.h', 294 'process_proxy/process_proxy_registry.h',
299 'system/name_value_pairs_parser.cc',
300 'system/name_value_pairs_parser.h',
301 ], 295 ],
302 'conditions': [ 296 'conditions': [
303 ['use_x11 == 1', { 297 ['use_x11 == 1', {
304 'link_settings': { 298 'link_settings': {
305 'libraries': [ 299 'libraries': [
306 '-lXext', 300 '-lXext',
307 '-lXrandr', 301 '-lXrandr',
308 ], 302 ],
309 }, 303 },
310 }, { 304 }, {
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 '../crypto/crypto.gyp:crypto', 459 '../crypto/crypto.gyp:crypto',
466 '../dbus/dbus.gyp:dbus_test_support', 460 '../dbus/dbus.gyp:dbus_test_support',
467 '../net/net.gyp:net', 461 '../net/net.gyp:net',
468 '../testing/gmock.gyp:gmock', 462 '../testing/gmock.gyp:gmock',
469 '../testing/gtest.gyp:gtest', 463 '../testing/gtest.gyp:gtest',
470 'chromeos_test_support', 464 'chromeos_test_support',
471 'power_manager_proto', 465 'power_manager_proto',
472 ], 466 ],
473 'sources': [ 467 'sources': [
474 'attestation/attestation_flow_unittest.cc', 468 'attestation/attestation_flow_unittest.cc',
475 'app_mode/kiosk_oem_manifest_parser_unittest.cc',
476 'display/output_configurator_unittest.cc', 469 'display/output_configurator_unittest.cc',
477 'dbus/blocking_method_caller_unittest.cc', 470 'dbus/blocking_method_caller_unittest.cc',
478 'dbus/power_policy_controller_unittest.cc', 471 'dbus/power_policy_controller_unittest.cc',
479 'dbus/shill_client_unittest_base.cc', 472 'dbus/shill_client_unittest_base.cc',
480 'dbus/shill_client_unittest_base.h', 473 'dbus/shill_client_unittest_base.h',
481 'dbus/shill_device_client_unittest.cc', 474 'dbus/shill_device_client_unittest.cc',
482 'dbus/shill_ipconfig_client_unittest.cc', 475 'dbus/shill_ipconfig_client_unittest.cc',
483 'dbus/shill_manager_client_unittest.cc', 476 'dbus/shill_manager_client_unittest.cc',
484 'dbus/shill_profile_client_unittest.cc', 477 'dbus/shill_profile_client_unittest.cc',
485 'dbus/shill_service_client_unittest.cc', 478 'dbus/shill_service_client_unittest.cc',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 'network/network_util_unittest.cc', 511 'network/network_util_unittest.cc',
519 'network/onc/onc_certificate_importer_unittest.cc', 512 'network/onc/onc_certificate_importer_unittest.cc',
520 'network/onc/onc_merger_unittest.cc', 513 'network/onc/onc_merger_unittest.cc',
521 'network/onc/onc_normalizer_unittest.cc', 514 'network/onc/onc_normalizer_unittest.cc',
522 'network/onc/onc_translator_unittest.cc', 515 'network/onc/onc_translator_unittest.cc',
523 'network/onc/onc_utils_unittest.cc', 516 'network/onc/onc_utils_unittest.cc',
524 'network/onc/onc_validator_unittest.cc', 517 'network/onc/onc_validator_unittest.cc',
525 'network/shill_property_handler_unittest.cc', 518 'network/shill_property_handler_unittest.cc',
526 'process_proxy/process_output_watcher_unittest.cc', 519 'process_proxy/process_output_watcher_unittest.cc',
527 'process_proxy/process_proxy_unittest.cc', 520 'process_proxy/process_proxy_unittest.cc',
528 'system/name_value_pairs_parser_unittest.cc',
529 ], 521 ],
530 'include_dirs': [ 522 'include_dirs': [
531 '..', 523 '..',
532 ], 524 ],
533 'conditions': [ 525 'conditions': [
534 [ 'linux_use_tcmalloc==1', { 526 [ 'linux_use_tcmalloc==1', {
535 'dependencies': [ 527 'dependencies': [
536 '../base/allocator/allocator.gyp:allocator', 528 '../base/allocator/allocator.gyp:allocator',
537 ], 529 ],
538 }, 530 },
(...skipping 27 matching lines...) Expand all
566 '../third_party/cros_system_api/dbus/video_activity_update.proto', 558 '../third_party/cros_system_api/dbus/video_activity_update.proto',
567 ], 559 ],
568 'variables': { 560 'variables': {
569 'proto_in_dir': '../third_party/cros_system_api/dbus/', 561 'proto_in_dir': '../third_party/cros_system_api/dbus/',
570 'proto_out_dir': 'chromeos/dbus', 562 'proto_out_dir': 'chromeos/dbus',
571 }, 563 },
572 'includes': ['../build/protoc.gypi'], 564 'includes': ['../build/protoc.gypi'],
573 }, 565 },
574 ], 566 ],
575 } 567 }
OLDNEW
« no previous file with comments | « trunk/src/chromeos/app_mode/kiosk_oem_manifest_parser_unittest.cc ('k') | trunk/src/chromeos/chromeos_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698