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

Side by Side Diff: content/content_shell.gypi

Issue 8137012: Make an empty content browser test work. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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 | « content/browser/browser_main.cc ('k') | content/content_tests.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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'content_shell', 8 'target_name': 'content_shell_lib',
9 'type': 'executable', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
11 'variables': { 11 'variables': {
12 'chromium_code': 1, 12 'chromium_code': 1,
13 }, 13 },
14 'dependencies': [ 14 'dependencies': [
15 'content_app', 15 'content_app',
16 'content_browser', 16 'content_browser',
17 'content_common', 17 'content_common',
18 'content_gpu', 18 'content_gpu',
19 'content_plugin', 19 'content_plugin',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 'shell/shell_content_client.cc', 58 'shell/shell_content_client.cc',
59 'shell/shell_content_client.h', 59 'shell/shell_content_client.h',
60 'shell/shell_content_plugin_client.cc', 60 'shell/shell_content_plugin_client.cc',
61 'shell/shell_content_plugin_client.h', 61 'shell/shell_content_plugin_client.h',
62 'shell/shell_content_renderer_client.cc', 62 'shell/shell_content_renderer_client.cc',
63 'shell/shell_content_renderer_client.h', 63 'shell/shell_content_renderer_client.h',
64 'shell/shell_content_utility_client.cc', 64 'shell/shell_content_utility_client.cc',
65 'shell/shell_content_utility_client.h', 65 'shell/shell_content_utility_client.h',
66 'shell/shell_download_manager_delegate.cc', 66 'shell/shell_download_manager_delegate.cc',
67 'shell/shell_download_manager_delegate.h', 67 'shell/shell_download_manager_delegate.h',
68 'shell/shell_main.cc', 68 'shell/shell_main_delegate.cc',
69 'shell/shell_main_delegate.h',
69 'shell/shell_resource_context.cc', 70 'shell/shell_resource_context.cc',
70 'shell/shell_resource_context.h', 71 'shell/shell_resource_context.h',
71 'shell/shell_url_request_context_getter.cc', 72 'shell/shell_url_request_context_getter.cc',
72 'shell/shell_url_request_context_getter.h', 73 'shell/shell_url_request_context_getter.h',
73 ], 74 ],
74 'msvs_settings': { 75 'msvs_settings': {
75 'VCLinkerTool': { 76 'VCLinkerTool': {
76 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 77 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
77 }, 78 },
78 }, 79 },
79 'conditions': [ 80 'conditions': [
80 ['OS=="win" and win_use_allocator_shim==1', { 81 ['OS=="win" and win_use_allocator_shim==1', {
81 'dependencies': [ 82 'dependencies': [
82 '../base/allocator/allocator.gyp:allocator', 83 '../base/allocator/allocator.gyp:allocator',
83 ], 84 ],
84 }], 85 }],
85 ['OS=="win"', { 86 ['OS=="win"', {
86 'resource_include_dirs': [ 87 'resource_include_dirs': [
87 '<(SHARED_INTERMEDIATE_DIR)/webkit', 88 '<(SHARED_INTERMEDIATE_DIR)/webkit',
88 ], 89 ],
89 'sources': [
90 'shell/resource.h',
91 'shell/shell.rc',
92 # TODO: It would be nice to have these pulled in
93 # automatically from direct_dependent_settings in
94 # their various targets (net.gyp:net_resources, etc.),
95 # but that causes errors in other targets when
96 # resulting .res files get referenced multiple times.
97 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
98 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
99 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
100 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
101 ],
102 'dependencies': [ 90 'dependencies': [
103 '<(DEPTH)/net/net.gyp:net_resources', 91 '<(DEPTH)/net/net.gyp:net_resources',
104 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', 92 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
105 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', 93 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
106 ], 94 ],
107 'configurations': { 95 'configurations': {
108 'Debug_Base': { 96 'Debug_Base': {
109 'msvs_settings': { 97 'msvs_settings': {
110 'VCLinkerTool': { 98 'VCLinkerTool': {
111 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 99 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
112 }, 100 },
113 }, 101 },
114 }, 102 },
115 }, 103 },
116 }], 104 }],
117 ], 105 ],
118 }, 106 },
107 {
108 'target_name': 'content_shell',
109 'type': 'executable',
110 'defines!': ['CONTENT_IMPLEMENTATION'],
111 'variables': {
112 'chromium_code': 1,
113 },
114 'dependencies': [
115 'content_shell_lib',
116 ],
117 'include_dirs': [
118 '..',
119 ],
120 'sources': [
121 'shell/shell_main.cc',
122 ],
123 'msvs_settings': {
124 'VCLinkerTool': {
125 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
126 },
127 },
128 'conditions': [
129 ['OS=="win" and win_use_allocator_shim==1', {
130 'dependencies': [
131 '../base/allocator/allocator.gyp:allocator',
132 ],
133 }],
134 ['OS=="win"', {
135 'configurations': {
136 'Debug_Base': {
137 'msvs_settings': {
138 'VCLinkerTool': {
139 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
140 },
141 },
142 },
143 },
144 }],
145 ],
146 },
119 ], 147 ],
120 } 148 }
OLDNEW
« no previous file with comments | « content/browser/browser_main.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698