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

Side by Side Diff: chromeos/chromeos.gyp

Issue 12433023: Move chrome/browser/chromeos/process_proxy to chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chromeos/process_proxy/OWNERS » ('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 'includes': [ 9 'includes': [
10 'chromeos_tools.gypi' 10 'chromeos_tools.gypi'
11 ], 11 ],
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'chromeos', 14 'target_name': 'chromeos',
15 'type': '<(component)', 15 'type': '<(component)',
16 'dependencies': [ 16 'dependencies': [
17 '../base/base.gyp:base', 17 '../base/base.gyp:base',
18 '../base/base.gyp:base_prefs', 18 '../base/base.gyp:base_prefs',
19 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
19 '../build/linux/system.gyp:dbus', 20 '../build/linux/system.gyp:dbus',
20 '../build/linux/system.gyp:ssl', 21 '../build/linux/system.gyp:ssl',
21 '../dbus/dbus.gyp:dbus', 22 '../dbus/dbus.gyp:dbus',
22 '../net/net.gyp:net', 23 '../net/net.gyp:net',
23 '../third_party/libxml/libxml.gyp:libxml', 24 '../third_party/libxml/libxml.gyp:libxml',
24 'power_manager_proto', 25 'power_manager_proto',
25 'power_state_control_proto', 26 'power_state_control_proto',
26 'power_supply_properties_proto', 27 'power_supply_properties_proto',
27 'video_activity_update_proto', 28 'video_activity_update_proto',
28 ], 29 ],
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 'network/onc/onc_utils.cc', 191 'network/onc/onc_utils.cc',
191 'network/onc/onc_utils.h', 192 'network/onc/onc_utils.h',
192 'network/onc/onc_validator.cc', 193 'network/onc/onc_validator.cc',
193 'network/onc/onc_validator.h', 194 'network/onc/onc_validator.h',
194 'network/shill_property_handler.cc', 195 'network/shill_property_handler.cc',
195 'network/shill_property_handler.h', 196 'network/shill_property_handler.h',
196 'network/sms_watcher.cc', 197 'network/sms_watcher.cc',
197 'network/sms_watcher.h', 198 'network/sms_watcher.h',
198 'power/power_state_override.cc', 199 'power/power_state_override.cc',
199 'power/power_state_override.h', 200 'power/power_state_override.h',
201 'process_proxy/process_output_watcher.cc',
202 'process_proxy/process_output_watcher.h',
203 'process_proxy/process_proxy.cc',
204 'process_proxy/process_proxy.h',
205 'process_proxy/process_proxy_registry.cc',
206 'process_proxy/process_proxy_registry.h',
200 ], 207 ],
201 'conditions': [ 208 'conditions': [
202 ['use_x11 == 1', { 209 ['use_x11 == 1', {
203 'link_settings': { 210 'link_settings': {
204 'libraries': [ 211 'libraries': [
205 '-lXext', 212 '-lXext',
206 '-lXrandr', 213 '-lXrandr',
207 ], 214 ],
208 }, 215 },
209 }, { 216 }, {
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 'network/network_state_handler_unittest.cc', 375 'network/network_state_handler_unittest.cc',
369 'network/network_util_unittest.cc', 376 'network/network_util_unittest.cc',
370 'network/onc/onc_certificate_importer_unittest.cc', 377 'network/onc/onc_certificate_importer_unittest.cc',
371 'network/onc/onc_merger_unittest.cc', 378 'network/onc/onc_merger_unittest.cc',
372 'network/onc/onc_normalizer_unittest.cc', 379 'network/onc/onc_normalizer_unittest.cc',
373 'network/onc/onc_translator_unittest.cc', 380 'network/onc/onc_translator_unittest.cc',
374 'network/onc/onc_utils_unittest.cc', 381 'network/onc/onc_utils_unittest.cc',
375 'network/onc/onc_validator_unittest.cc', 382 'network/onc/onc_validator_unittest.cc',
376 'network/shill_property_handler_unittest.cc', 383 'network/shill_property_handler_unittest.cc',
377 'power/power_state_override_unittest.cc', 384 'power/power_state_override_unittest.cc',
385 'process_proxy/process_output_watcher_unittest.cc',
386 'process_proxy/process_proxy_unittest.cc',
378 ], 387 ],
379 'include_dirs': [ 388 'include_dirs': [
380 '..', 389 '..',
381 ], 390 ],
382 'conditions': [ 391 'conditions': [
383 [ 'linux_use_tcmalloc==1', { 392 [ 'linux_use_tcmalloc==1', {
384 'dependencies': [ 393 'dependencies': [
385 '../base/allocator/allocator.gyp:allocator', 394 '../base/allocator/allocator.gyp:allocator',
386 ], 395 ],
387 }, 396 },
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 '../third_party/cros_system_api/dbus/video_activity_update.proto', 450 '../third_party/cros_system_api/dbus/video_activity_update.proto',
442 ], 451 ],
443 'variables': { 452 'variables': {
444 'proto_in_dir': '../third_party/cros_system_api/dbus/', 453 'proto_in_dir': '../third_party/cros_system_api/dbus/',
445 'proto_out_dir': 'chromeos/dbus', 454 'proto_out_dir': 'chromeos/dbus',
446 }, 455 },
447 'includes': ['../build/protoc.gypi'], 456 'includes': ['../build/protoc.gypi'],
448 }, 457 },
449 ], 458 ],
450 } 459 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chromeos/process_proxy/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698