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

Side by Side Diff: ui/views/views.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 | « ui/views/controls/webview/webview.gyp ('k') | webkit/base/webkit_base.gypi » ('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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'target_defaults': { 8 'target_defaults': {
9 'conditions': [ 9 'conditions': [
10 ['use_aura==1', { 10 ['use_aura==1', {
11 'sources/': [ ['exclude', '_win\\.(h|cc)$'] ], 11 'sources/': [ ['exclude', '_win\\.(h|cc)$'] ],
12 'dependencies': [ '../aura/aura.gyp:aura', ], 12 'dependencies': [ '../aura/aura.gyp:aura', ],
13 }], 13 }],
14 ['OS!="linux" or chromeos==1', { 14 ['OS!="linux" or chromeos==1', {
15 'sources/': [ ['exclude', '_linux\\.(h|cc)$'] ], 15 'sources/': [ ['exclude', '_linux\\.(h|cc)$'] ],
16 }], 16 }],
17 ], 17 ],
18 }, 18 },
19 'targets': [ 19 'targets': [
20 { 20 {
21 'target_name': 'views', 21 'target_name': 'views',
22 'type': '<(component)', 22 'type': '<(component)',
23 'dependencies': [ 23 'dependencies': [
24 '../../base/base.gyp:base', 24 '../../base/base.gyp:base',
25 '../../base/base.gyp:base_i18n', 25 '../../base/base.gyp:base_i18n',
26 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 26 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
27 '../../build/temp_gyp/googleurl.gyp:googleurl',
28 '../../skia/skia.gyp:skia', 27 '../../skia/skia.gyp:skia',
29 '../../third_party/icu/icu.gyp:icui18n', 28 '../../third_party/icu/icu.gyp:icui18n',
30 '../../third_party/icu/icu.gyp:icuuc', 29 '../../third_party/icu/icu.gyp:icuuc',
30 '../../url/url.gyp:url_lib',
31 '../base/strings/ui_strings.gyp:ui_strings', 31 '../base/strings/ui_strings.gyp:ui_strings',
32 '../compositor/compositor.gyp:compositor', 32 '../compositor/compositor.gyp:compositor',
33 '../native_theme/native_theme.gyp:native_theme', 33 '../native_theme/native_theme.gyp:native_theme',
34 '../ui.gyp:ui', 34 '../ui.gyp:ui',
35 '../ui.gyp:ui_resources', 35 '../ui.gyp:ui_resources',
36 ], 36 ],
37 'defines': [ 37 'defines': [
38 'VIEWS_IMPLEMENTATION', 38 'VIEWS_IMPLEMENTATION',
39 ], 39 ],
40 'sources': [ 40 'sources': [
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 'target_name': 'views_unittests', 652 'target_name': 'views_unittests',
653 'type': 'executable', 653 'type': 'executable',
654 'dependencies': [ 654 'dependencies': [
655 '../../base/base.gyp:base', 655 '../../base/base.gyp:base',
656 '../../base/base.gyp:base_i18n', 656 '../../base/base.gyp:base_i18n',
657 '../../base/base.gyp:test_support_base', 657 '../../base/base.gyp:test_support_base',
658 # TODO(jcivelli): ideally the resource needed by views would be 658 # TODO(jcivelli): ideally the resource needed by views would be
659 # factored out. (for some reason it pulls in a bunch 659 # factored out. (for some reason it pulls in a bunch
660 # unrelated things like v8, sqlite nss...). 660 # unrelated things like v8, sqlite nss...).
661 '../../chrome/chrome_resources.gyp:packed_resources', 661 '../../chrome/chrome_resources.gyp:packed_resources',
662 '../../build/temp_gyp/googleurl.gyp:googleurl',
663 '../../skia/skia.gyp:skia', 662 '../../skia/skia.gyp:skia',
664 '../../testing/gmock.gyp:gmock', 663 '../../testing/gmock.gyp:gmock',
665 '../../testing/gtest.gyp:gtest', 664 '../../testing/gtest.gyp:gtest',
666 '../../third_party/icu/icu.gyp:icui18n', 665 '../../third_party/icu/icu.gyp:icui18n',
667 '../../third_party/icu/icu.gyp:icuuc', 666 '../../third_party/icu/icu.gyp:icuuc',
667 '../../url/url.gyp:url_lib',
668 '../base/strings/ui_strings.gyp:ui_strings', 668 '../base/strings/ui_strings.gyp:ui_strings',
669 '../compositor/compositor.gyp:compositor', 669 '../compositor/compositor.gyp:compositor',
670 '../compositor/compositor.gyp:compositor_test_support', 670 '../compositor/compositor.gyp:compositor_test_support',
671 '../ui.gyp:ui', 671 '../ui.gyp:ui',
672 '../ui.gyp:ui_resources', 672 '../ui.gyp:ui_resources',
673 '../ui.gyp:ui_test_support', 673 '../ui.gyp:ui_test_support',
674 'views', 674 'views',
675 'views_test_support', 675 'views_test_support',
676 ], 676 ],
677 'include_dirs': [ 677 'include_dirs': [
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 'sources': [ 872 'sources': [
873 'examples/examples_main.cc', 873 'examples/examples_main.cc',
874 ], 874 ],
875 }, # target_name: views_examples_exe 875 }, # target_name: views_examples_exe
876 { 876 {
877 'target_name': 'views_examples_with_content_lib', 877 'target_name': 'views_examples_with_content_lib',
878 'type': '<(component)', 878 'type': '<(component)',
879 'dependencies': [ 879 'dependencies': [
880 '../../base/base.gyp:base', 880 '../../base/base.gyp:base',
881 '../../base/base.gyp:base_i18n', 881 '../../base/base.gyp:base_i18n',
882 '../../build/temp_gyp/googleurl.gyp:googleurl',
883 '../../chrome/chrome_resources.gyp:packed_resources', 882 '../../chrome/chrome_resources.gyp:packed_resources',
884 '../../content/content.gyp:content', 883 '../../content/content.gyp:content',
885 '../../skia/skia.gyp:skia', 884 '../../skia/skia.gyp:skia',
886 '../../third_party/icu/icu.gyp:icui18n', 885 '../../third_party/icu/icu.gyp:icui18n',
887 '../../third_party/icu/icu.gyp:icuuc', 886 '../../third_party/icu/icu.gyp:icuuc',
887 '../../url/url.gyp:url_lib',
888 '../ui.gyp:ui', 888 '../ui.gyp:ui',
889 '../ui.gyp:ui_resources', 889 '../ui.gyp:ui_resources',
890 'controls/webview/webview.gyp:webview', 890 'controls/webview/webview.gyp:webview',
891 'views', 891 'views',
892 ], 892 ],
893 'include_dirs': [ 893 'include_dirs': [
894 '..', 894 '..',
895 ], 895 ],
896 'defines': [ 896 'defines': [
897 'VIEWS_EXAMPLES_WITH_CONTENT_IMPLEMENTATION', 897 'VIEWS_EXAMPLES_WITH_CONTENT_IMPLEMENTATION',
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
1020 'sources/': [ 1020 'sources/': [
1021 # This is needed because the aura rule strips it from the default 1021 # This is needed because the aura rule strips it from the default
1022 # sources list. 1022 # sources list.
1023 ['include', '^../../content/app/startup_helper_win.cc'], 1023 ['include', '^../../content/app/startup_helper_win.cc'],
1024 ], 1024 ],
1025 }], 1025 }],
1026 ], 1026 ],
1027 }, # target_name: views_examples_with_content_exe 1027 }, # target_name: views_examples_with_content_exe
1028 ], 1028 ],
1029 } 1029 }
OLDNEW
« no previous file with comments | « ui/views/controls/webview/webview.gyp ('k') | webkit/base/webkit_base.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698