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

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
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 'shell/shell_content_client.cc', 57 'shell/shell_content_client.cc',
58 'shell/shell_content_client.h', 58 'shell/shell_content_client.h',
59 'shell/shell_content_plugin_client.cc', 59 'shell/shell_content_plugin_client.cc',
60 'shell/shell_content_plugin_client.h', 60 'shell/shell_content_plugin_client.h',
61 'shell/shell_content_renderer_client.cc', 61 'shell/shell_content_renderer_client.cc',
62 'shell/shell_content_renderer_client.h', 62 'shell/shell_content_renderer_client.h',
63 'shell/shell_content_utility_client.cc', 63 'shell/shell_content_utility_client.cc',
64 'shell/shell_content_utility_client.h', 64 'shell/shell_content_utility_client.h',
65 'shell/shell_download_manager_delegate.cc', 65 'shell/shell_download_manager_delegate.cc',
66 'shell/shell_download_manager_delegate.h', 66 'shell/shell_download_manager_delegate.h',
67 'shell/shell_main.cc', 67 'shell/shell_main_delegate.cc',
68 'shell/shell_main_delegate.h',
68 'shell/shell_resource_context.cc', 69 'shell/shell_resource_context.cc',
69 'shell/shell_resource_context.h', 70 'shell/shell_resource_context.h',
70 'shell/shell_url_request_context_getter.cc', 71 'shell/shell_url_request_context_getter.cc',
71 'shell/shell_url_request_context_getter.h', 72 'shell/shell_url_request_context_getter.h',
72 ], 73 ],
73 'msvs_settings': { 74 'msvs_settings': {
74 'VCLinkerTool': { 75 'VCLinkerTool': {
75 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 76 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
76 }, 77 },
77 }, 78 },
78 'conditions': [ 79 'conditions': [
79 ['OS=="win" and win_use_allocator_shim==1', { 80 ['OS=="win" and win_use_allocator_shim==1', {
80 'dependencies': [ 81 'dependencies': [
81 '../base/allocator/allocator.gyp:allocator', 82 '../base/allocator/allocator.gyp:allocator',
82 ], 83 ],
83 }], 84 }],
84 ['OS=="win"', { 85 ['OS=="win"', {
85 'resource_include_dirs': [ 86 'resource_include_dirs': [
jam 2011/10/04 22:21:13 do you need this block (86-105) twice, here and be
Paweł Hajdan Jr. 2011/10/04 23:19:48 Done.
86 '<(SHARED_INTERMEDIATE_DIR)/webkit', 87 '<(SHARED_INTERMEDIATE_DIR)/webkit',
87 ], 88 ],
89 'dependencies': [
90 '<(DEPTH)/net/net.gyp:net_resources',
91 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
92 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
93 ],
94 'configurations': {
95 'Debug_Base': {
96 'msvs_settings': {
97 'VCLinkerTool': {
98 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
99 },
100 },
101 },
102 },
103 }],
104 ],
105 },
106 {
107 'target_name': 'content_shell',
108 'type': 'executable',
109 'defines!': ['CONTENT_IMPLEMENTATION'],
110 'variables': {
111 'chromium_code': 1,
112 },
113 'dependencies': [
114 'content_shell_lib',
115 ],
116 'include_dirs': [
117 '..',
118 ],
119 'sources': [
120 'shell/shell_main.cc',
121 ],
122 'msvs_settings': {
123 'VCLinkerTool': {
124 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
125 },
126 },
127 'conditions': [
128 ['OS=="win" and win_use_allocator_shim==1', {
129 'dependencies': [
130 '../base/allocator/allocator.gyp:allocator',
131 ],
132 }],
133 ['OS=="win"', {
134 'resource_include_dirs': [
135 '<(SHARED_INTERMEDIATE_DIR)/webkit',
136 ],
88 'sources': [ 137 'sources': [
89 'shell/resource.h', 138 'shell/resource.h',
90 'shell/shell.rc', 139 'shell/shell.rc',
91 # TODO: It would be nice to have these pulled in 140 # TODO: It would be nice to have these pulled in
92 # automatically from direct_dependent_settings in 141 # automatically from direct_dependent_settings in
93 # their various targets (net.gyp:net_resources, etc.), 142 # their various targets (net.gyp:net_resources, etc.),
94 # but that causes errors in other targets when 143 # but that causes errors in other targets when
95 # resulting .res files get referenced multiple times. 144 # resulting .res files get referenced multiple times.
96 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 145 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
97 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 146 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
(...skipping 12 matching lines...) Expand all
110 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 159 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
111 }, 160 },
112 }, 161 },
113 }, 162 },
114 }, 163 },
115 }], 164 }],
116 ], 165 ],
117 }, 166 },
118 ], 167 ],
119 } 168 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698