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

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: 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_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',
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 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 ], 467 ],
468 }, 468 },
469 { 469 {
470 'target_name': 'chromeos_unittests', 470 'target_name': 'chromeos_unittests',
471 'type': 'executable', 471 'type': 'executable',
472 'dependencies': [ 472 'dependencies': [
473 '../base/base.gyp:run_all_unittests', 473 '../base/base.gyp:run_all_unittests',
474 '../base/base.gyp:test_support_base', 474 '../base/base.gyp:test_support_base',
475 '../build/linux/system.gyp:dbus', 475 '../build/linux/system.gyp:dbus',
476 '../build/linux/system.gyp:ssl', 476 '../build/linux/system.gyp:ssl',
477 '../build/temp_gyp/googleurl.gyp:googleurl',
478 '../crypto/crypto.gyp:crypto', 477 '../crypto/crypto.gyp:crypto',
479 '../dbus/dbus.gyp:dbus_test_support', 478 '../dbus/dbus.gyp:dbus_test_support',
480 '../net/net.gyp:net', 479 '../net/net.gyp:net',
481 '../testing/gmock.gyp:gmock', 480 '../testing/gmock.gyp:gmock',
482 '../testing/gtest.gyp:gtest', 481 '../testing/gtest.gyp:gtest',
482 '../url/url.gyp:url',
483 'chromeos_test_support', 483 'chromeos_test_support',
484 'power_manager_proto', 484 'power_manager_proto',
485 ], 485 ],
486 'sources': [ 486 'sources': [
487 'attestation/attestation_flow_unittest.cc', 487 'attestation/attestation_flow_unittest.cc',
488 'app_mode/kiosk_oem_manifest_parser_unittest.cc', 488 'app_mode/kiosk_oem_manifest_parser_unittest.cc',
489 'display/output_configurator_unittest.cc', 489 'display/output_configurator_unittest.cc',
490 'display/output_util_unittest.cc', 490 'display/output_util_unittest.cc',
491 'dbus/blocking_method_caller_unittest.cc', 491 'dbus/blocking_method_caller_unittest.cc',
492 'dbus/power_policy_controller_unittest.cc', 492 'dbus/power_policy_controller_unittest.cc',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 '../third_party/cros_system_api/dbus/video_activity_update.proto', 583 '../third_party/cros_system_api/dbus/video_activity_update.proto',
584 ], 584 ],
585 'variables': { 585 'variables': {
586 'proto_in_dir': '../third_party/cros_system_api/dbus/', 586 'proto_in_dir': '../third_party/cros_system_api/dbus/',
587 'proto_out_dir': 'chromeos/dbus', 587 'proto_out_dir': 'chromeos/dbus',
588 }, 588 },
589 'includes': ['../build/protoc.gypi'], 589 'includes': ['../build/protoc.gypi'],
590 }, 590 },
591 ], 591 ],
592 } 592 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698