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

Side by Side Diff: ui/views/views.gyp

Issue 10983036: Revert 158792 - views: Remove content dependency from views package. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | « no previous file | no next file » | 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 8
9 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
11 ['use_aura==1', { 11 ['use_aura==1', {
12 'sources/': [ ['exclude', '_win\\.(h|cc)$'] ], 12 'sources/': [ ['exclude', '_win\\.(h|cc)$'] ],
13 'dependencies': [ '../aura/aura.gyp:aura', ], 13 'dependencies': [ '../aura/aura.gyp:aura', ],
14 }], 14 }],
15 ['OS!="linux" or chromeos==1', { 15 ['OS!="linux" or chromeos==1', {
16 'sources/': [ ['exclude', '_linux\\.(h|cc)$'] ], 16 'sources/': [ ['exclude', '_linux\\.(h|cc)$'] ],
17 }], 17 }],
18 ], 18 ],
19 }, 19 },
20 'targets': [ 20 'targets': [
21 { 21 {
22 'target_name': 'views', 22 'target_name': 'views',
23 'type': '<(component)', 23 'type': '<(component)',
24 'dependencies': [ 24 'dependencies': [
25 '../../base/base.gyp:base', 25 '../../base/base.gyp:base',
26 '../../base/base.gyp:base_i18n', 26 '../../base/base.gyp:base_i18n',
27 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 27 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
28 '../../build/temp_gyp/googleurl.gyp:googleurl', 28 '../../build/temp_gyp/googleurl.gyp:googleurl',
29 '../../content/content.gyp:content',
29 '../../skia/skia.gyp:skia', 30 '../../skia/skia.gyp:skia',
30 '../../third_party/icu/icu.gyp:icui18n', 31 '../../third_party/icu/icu.gyp:icui18n',
31 '../../third_party/icu/icu.gyp:icuuc', 32 '../../third_party/icu/icu.gyp:icuuc',
32 '../base/strings/ui_strings.gyp:ui_strings', 33 '../base/strings/ui_strings.gyp:ui_strings',
33 '../compositor/compositor.gyp:compositor', 34 '../compositor/compositor.gyp:compositor',
34 '../ui.gyp:ui', 35 '../ui.gyp:ui',
35 '../ui.gyp:ui_resources', 36 '../ui.gyp:ui_resources',
36 ], 37 ],
37 'defines': [ 38 'defines': [
38 'VIEWS_IMPLEMENTATION', 39 'VIEWS_IMPLEMENTATION',
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 'widget/widget_hwnd_utils.h', 481 'widget/widget_hwnd_utils.h',
481 ], 482 ],
482 }], 483 }],
483 ], 484 ],
484 }, # target_name: views 485 }, # target_name: views
485 { 486 {
486 'target_name': 'test_support_views', 487 'target_name': 'test_support_views',
487 'type': 'static_library', 488 'type': 'static_library',
488 'dependencies': [ 489 'dependencies': [
489 '../../base/base.gyp:base', 490 '../../base/base.gyp:base',
490 '../../content/content.gyp:content',
491 '../../content/content.gyp:test_support_content', 491 '../../content/content.gyp:test_support_content',
492 '../../ipc/ipc.gyp:test_support_ipc', 492 '../../ipc/ipc.gyp:test_support_ipc',
493 '../../skia/skia.gyp:skia', 493 '../../skia/skia.gyp:skia',
494 '../../testing/gtest.gyp:gtest', 494 '../../testing/gtest.gyp:gtest',
495 '../ui.gyp:ui', 495 '../ui.gyp:ui',
496 'controls/webview/webview.gyp:webview', 496 'controls/webview/webview.gyp:webview',
497 'views', 497 'views',
498 ], 498 ],
499 'include_dirs': [ 499 'include_dirs': [
500 '..', 500 '..',
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 'sources/': [ 839 'sources/': [
840 # This is needed because the aura rule strips it from the default 840 # This is needed because the aura rule strips it from the default
841 # sources list. 841 # sources list.
842 ['include', '^../../content/app/startup_helper_win.cc'], 842 ['include', '^../../content/app/startup_helper_win.cc'],
843 ], 843 ],
844 }], 844 }],
845 ], 845 ],
846 }, # target_name: views_examples_with_content_exe 846 }, # target_name: views_examples_with_content_exe
847 ], 847 ],
848 } 848 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698