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

Side by Side Diff: chromeos/chromeos.gyp

Issue 15421002: Roll DEPS for googleurl. Second try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chrome_frame_ie fix Created 7 years, 6 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_frame/chrome_frame.gyp ('k') | cloud_print/service/service.gyp » ('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_memory.gypi', 10 'chromeos_memory.gypi',
11 'chromeos_tools.gypi', 11 'chromeos_tools.gypi',
12 ], 12 ],
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'chromeos', 15 'target_name': 'chromeos',
16 'type': '<(component)', 16 'type': '<(component)',
17 'dependencies': [ 17 'dependencies': [
18 '../base/base.gyp:base', 18 '../base/base.gyp:base',
19 '../base/base.gyp:base_prefs', 19 '../base/base.gyp:base_prefs',
20 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 20 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
21 '../build/linux/system.gyp:dbus', 21 '../build/linux/system.gyp:dbus',
22 '../build/linux/system.gyp:ssl', 22 '../build/linux/system.gyp:ssl',
23 '../build/temp_gyp/googleurl.gyp:googleurl',
24 '../dbus/dbus.gyp:dbus', 23 '../dbus/dbus.gyp:dbus',
25 '../net/net.gyp:net', 24 '../net/net.gyp:net',
26 '../third_party/libxml/libxml.gyp:libxml', 25 '../third_party/libxml/libxml.gyp:libxml',
26 '../url/url.gyp:url_lib',
27 'ime/input_method.gyp:gencode', 27 'ime/input_method.gyp:gencode',
28 'power_manager_proto', 28 'power_manager_proto',
29 'video_activity_update_proto', 29 'video_activity_update_proto',
30 ], 30 ],
31 'defines': [ 31 'defines': [
32 'CHROMEOS_IMPLEMENTATION', 32 'CHROMEOS_IMPLEMENTATION',
33 ], 33 ],
34 'sources': [ 34 'sources': [
35 'app_mode/kiosk_oem_manifest_parser.cc', 35 'app_mode/kiosk_oem_manifest_parser.cc',
36 'app_mode/kiosk_oem_manifest_parser.h', 36 'app_mode/kiosk_oem_manifest_parser.h',
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 'process_proxy/process_output_watcher.h', 294 'process_proxy/process_output_watcher.h',
295 'process_proxy/process_proxy.cc', 295 'process_proxy/process_proxy.cc',
296 'process_proxy/process_proxy.h', 296 'process_proxy/process_proxy.h',
297 'process_proxy/process_proxy_registry.cc', 297 'process_proxy/process_proxy_registry.cc',
298 'process_proxy/process_proxy_registry.h', 298 'process_proxy/process_proxy_registry.h',
299 'system/name_value_pairs_parser.cc', 299 'system/name_value_pairs_parser.cc',
300 'system/name_value_pairs_parser.h', 300 'system/name_value_pairs_parser.h',
301 ], 301 ],
302 'conditions': [ 302 'conditions': [
303 ['use_x11 == 1', { 303 ['use_x11 == 1', {
304 'dependencies': [
305 '../build/linux/system.gyp:glib',
306 ],
304 'link_settings': { 307 'link_settings': {
305 'libraries': [ 308 'libraries': [
309 '-lX11',
306 '-lXext', 310 '-lXext',
311 '-lXi',
307 '-lXrandr', 312 '-lXrandr',
308 ], 313 ],
309 }, 314 },
310 }, { 315 }, {
311 # use_x11 == 0 316 # use_x11 == 0
312 'sources!': [ 317 'sources!': [
313 'ime/xkeyboard.cc', 318 'ime/xkeyboard.cc',
314 'ime/xkeyboard.h', 319 'ime/xkeyboard.h',
315 'display/output_configurator.cc', 320 'display/output_configurator.cc',
316 'display/output_configurator.h', 321 'display/output_configurator.h',
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 ], 436 ],
432 }, 437 },
433 { 438 {
434 'target_name': 'chromeos_unittests', 439 'target_name': 'chromeos_unittests',
435 'type': 'executable', 440 'type': 'executable',
436 'dependencies': [ 441 'dependencies': [
437 '../base/base.gyp:run_all_unittests', 442 '../base/base.gyp:run_all_unittests',
438 '../base/base.gyp:test_support_base', 443 '../base/base.gyp:test_support_base',
439 '../build/linux/system.gyp:dbus', 444 '../build/linux/system.gyp:dbus',
440 '../build/linux/system.gyp:ssl', 445 '../build/linux/system.gyp:ssl',
441 '../build/temp_gyp/googleurl.gyp:googleurl',
442 '../crypto/crypto.gyp:crypto', 446 '../crypto/crypto.gyp:crypto',
443 '../dbus/dbus.gyp:dbus_test_support', 447 '../dbus/dbus.gyp:dbus_test_support',
444 '../net/net.gyp:net', 448 '../net/net.gyp:net',
445 '../testing/gmock.gyp:gmock', 449 '../testing/gmock.gyp:gmock',
446 '../testing/gtest.gyp:gtest', 450 '../testing/gtest.gyp:gtest',
451 '../url/url.gyp:url_lib',
447 'chromeos_test_support', 452 'chromeos_test_support',
448 'power_manager_proto', 453 'power_manager_proto',
449 ], 454 ],
450 'sources': [ 455 'sources': [
451 'attestation/attestation_flow_unittest.cc', 456 'attestation/attestation_flow_unittest.cc',
452 'app_mode/kiosk_oem_manifest_parser_unittest.cc', 457 'app_mode/kiosk_oem_manifest_parser_unittest.cc',
453 'display/output_configurator_unittest.cc', 458 'display/output_configurator_unittest.cc',
454 'display/output_util_unittest.cc', 459 'display/output_util_unittest.cc',
455 'dbus/blocking_method_caller_unittest.cc', 460 'dbus/blocking_method_caller_unittest.cc',
456 'dbus/power_policy_controller_unittest.cc', 461 'dbus/power_policy_controller_unittest.cc',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 '../third_party/cros_system_api/dbus/video_activity_update.proto', 552 '../third_party/cros_system_api/dbus/video_activity_update.proto',
548 ], 553 ],
549 'variables': { 554 'variables': {
550 'proto_in_dir': '../third_party/cros_system_api/dbus/', 555 'proto_in_dir': '../third_party/cros_system_api/dbus/',
551 'proto_out_dir': 'chromeos/dbus', 556 'proto_out_dir': 'chromeos/dbus',
552 }, 557 },
553 'includes': ['../build/protoc.gypi'], 558 'includes': ['../build/protoc.gypi'],
554 }, 559 },
555 ], 560 ],
556 } 561 }
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | cloud_print/service/service.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698