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

Side by Side Diff: webkit/tools/test_shell/test_shell.gyp

Issue 119024: Fixing incorrect dependency revealed by chrome.sln moving to gyp.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 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
« 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) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'test_shell_windows_resource_files': [ 8 'test_shell_windows_resource_files': [
9 'resources/test_shell.rc', 9 'resources/test_shell.rc',
10 'resources/pan_east.cur', 10 'resources/pan_east.cur',
(...skipping 11 matching lines...) Expand all
22 ], 22 ],
23 }, 23 },
24 'includes': [ 24 'includes': [
25 '../../../build/common.gypi', 25 '../../../build/common.gypi',
26 ], 26 ],
27 'targets': [ 27 'targets': [
28 { 28 {
29 'target_name': 'test_shell_common', 29 'target_name': 'test_shell_common',
30 'type': '<(library)', 30 'type': '<(library)',
31 'dependencies': [ 31 'dependencies': [
32 'npapi_layout_test_plugin',
32 '../../../base/base.gyp:base', 33 '../../../base/base.gyp:base',
33 '../../../base/base.gyp:base_gfx', 34 '../../../base/base.gyp:base_gfx',
34 '../../../net/net.gyp:net', 35 '../../../net/net.gyp:net',
35 '../../../skia/skia.gyp:skia', 36 '../../../skia/skia.gyp:skia',
36 '../../../testing/gtest.gyp:gtest', 37 '../../../testing/gtest.gyp:gtest',
37 '../../../third_party/npapi/npapi.gyp:npapi', 38 '../../../third_party/npapi/npapi.gyp:npapi',
38 '../../webkit.gyp:glue', 39 '../../webkit.gyp:glue',
39 '../../webkit.gyp:webkit', 40 '../../webkit.gyp:webkit',
40 '../../webkit.gyp:inspector_resources', 41 '../../webkit.gyp:inspector_resources',
41 ], 42 ],
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 ], 98 ],
98 'export_dependent_settings': [ 99 'export_dependent_settings': [
99 '../../../base/base.gyp:base', 100 '../../../base/base.gyp:base',
100 '../../../net/net.gyp:net', 101 '../../../net/net.gyp:net',
101 '../../webkit.gyp:glue', 102 '../../webkit.gyp:glue',
102 '../../webkit.gyp:webkit', 103 '../../webkit.gyp:webkit',
103 ], 104 ],
104 'conditions': [ 105 'conditions': [
105 ['OS!="win"', { 106 ['OS!="win"', {
106 'dependencies': [ 107 'dependencies': [
107 'npapi_layout_test_plugin',
108 'npapi_test_plugin', 108 'npapi_test_plugin',
109 ], 109 ],
110 }], 110 }],
111 ['OS=="linux"', { 111 ['OS=="linux"', {
112 'dependencies': [ 112 'dependencies': [
113 'test_shell_resources', 113 'test_shell_resources',
114 '../../../build/linux/system.gyp:gtk', 114 '../../../build/linux/system.gyp:gtk',
115 ], 115 ],
116 # for: test_shell_gtk.cc 116 # for: test_shell_gtk.cc
117 'cflags': ['-Wno-multichar'], 117 'cflags': ['-Wno-multichar'],
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 'conditions': [ 587 'conditions': [
588 ['OS!="win"', { 588 ['OS!="win"', {
589 'sources!' : ['test_worker/test_worker.def'], 589 'sources!' : ['test_worker/test_worker.def'],
590 }], 590 }],
591 ], 591 ],
592 }, 592 },
593 ], 593 ],
594 }], 594 }],
595 ], 595 ],
596 } 596 }
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