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

Side by Side Diff: extensions/shell/app_shell.gyp

Issue 649793003: Fix windows static library build of app_shell_browsertests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« 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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 ['OS=="win"', { 154 ['OS=="win"', {
155 'msvs_settings': { 155 'msvs_settings': {
156 'VCLinkerTool': { 156 'VCLinkerTool': {
157 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 157 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
158 }, 158 },
159 }, 159 },
160 'dependencies': [ 160 'dependencies': [
161 '<(DEPTH)/sandbox/sandbox.gyp:sandbox', 161 '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
162 ], 162 ],
163 }], 163 }],
164 ['OS=="win" and win_use_allocator_shim==1', {
165 'dependencies': [
166 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
167 ],
168 }],
164 ], 169 ],
165 }, 170 },
166 { 171 {
167 'target_name': 'app_shell_browsertests', 172 'target_name': 'app_shell_browsertests',
168 'type': '<(gtest_target_type)', 173 'type': '<(gtest_target_type)',
169 'dependencies': [ 174 'dependencies': [
170 'app_shell_lib', 175 'app_shell_lib',
171 # TODO(yoz): find the right deps 176 # TODO(yoz): find the right deps
172 '<(DEPTH)/base/base.gyp:test_support_base', 177 '<(DEPTH)/base/base.gyp:test_support_base',
173 '<(DEPTH)/content/content.gyp:content_app_both', 178 '<(DEPTH)/content/content.gyp:content_app_both',
(...skipping 18 matching lines...) Expand all
192 '../browser/guest_view/web_view/web_view_media_access_apitest.cc', 197 '../browser/guest_view/web_view/web_view_media_access_apitest.cc',
193 'browser/shell_browsertest.cc', 198 'browser/shell_browsertest.cc',
194 'test/shell_apitest.cc', 199 'test/shell_apitest.cc',
195 'test/shell_apitest.h', 200 'test/shell_apitest.h',
196 'test/shell_test.cc', 201 'test/shell_test.cc',
197 'test/shell_test.h', 202 'test/shell_test.h',
198 'test/shell_test_launcher_delegate.cc', 203 'test/shell_test_launcher_delegate.cc',
199 'test/shell_test_launcher_delegate.h', 204 'test/shell_test_launcher_delegate.h',
200 'test/shell_tests_main.cc', 205 'test/shell_tests_main.cc',
201 ], 206 ],
207 'conditions': [
208 ['OS=="win" and win_use_allocator_shim==1', {
209 'dependencies': [
210 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
211 ],
212 }],
213 ],
202 }, 214 },
203 { 215 {
204 'target_name': 'app_shell_unittests', 216 'target_name': 'app_shell_unittests',
205 'type': 'executable', 217 'type': 'executable',
206 'dependencies': [ 218 'dependencies': [
207 'app_shell_lib', 219 'app_shell_lib',
208 '<(DEPTH)/base/base.gyp:base', 220 '<(DEPTH)/base/base.gyp:base',
209 '<(DEPTH)/base/base.gyp:test_support_base', 221 '<(DEPTH)/base/base.gyp:test_support_base',
210 '<(DEPTH)/content/content.gyp:content_app_both', 222 '<(DEPTH)/content/content.gyp:content_app_both',
211 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', 223 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
(...skipping 13 matching lines...) Expand all
225 ['disable_nacl==1', { 237 ['disable_nacl==1', {
226 'sources!': [ 238 'sources!': [
227 'browser/shell_nacl_browser_delegate_unittest.cc', 239 'browser/shell_nacl_browser_delegate_unittest.cc',
228 ], 240 ],
229 }], 241 }],
230 ['chromeos==1', { 242 ['chromeos==1', {
231 'dependencies': [ 243 'dependencies': [
232 '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support_without_gmock' , 244 '<(DEPTH)/chromeos/chromeos.gyp:chromeos_test_support_without_gmock' ,
233 ], 245 ],
234 }], 246 }],
247 ['OS=="win" and win_use_allocator_shim==1', {
248 'dependencies': [
249 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
250 ],
251 }],
235 ], 252 ],
236 }, 253 },
237 { 254 {
238 'target_name': 'app_shell_version_header', 255 'target_name': 'app_shell_version_header',
239 'type': 'none', 256 'type': 'none',
240 'direct_dependent_settings': { 257 'direct_dependent_settings': {
241 'include_dirs': [ 258 'include_dirs': [
242 '<(SHARED_INTERMEDIATE_DIR)', 259 '<(SHARED_INTERMEDIATE_DIR)',
243 ], 260 ],
244 }, 261 },
(...skipping 21 matching lines...) Expand all
266 '<@(_outputs)', 283 '<@(_outputs)',
267 ], 284 ],
268 'includes': [ 285 'includes': [
269 '../../build/util/version.gypi', 286 '../../build/util/version.gypi',
270 ], 287 ],
271 }, 288 },
272 ], 289 ],
273 }, 290 },
274 ], # targets 291 ], # targets
275 } 292 }
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