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

Side by Side Diff: trunk/src/apps/shell/app_shell.gyp

Issue 297753002: Revert 271721 "VS2013 Update 2" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | trunk/src/build/get_landmines.py » ('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 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 'sources': [ 168 'sources': [
169 'app/shell_main.cc', 169 'app/shell_main.cc',
170 ], 170 ],
171 'conditions': [ 171 'conditions': [
172 ['OS=="win"', { 172 ['OS=="win"', {
173 'msvs_settings': { 173 'msvs_settings': {
174 'VCLinkerTool': { 174 'VCLinkerTool': {
175 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 175 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
176 }, 176 },
177 }, 177 },
178 'msvs_large_pdb': 1,
178 'dependencies': [ 179 'dependencies': [
179 '<(DEPTH)/sandbox/sandbox.gyp:sandbox', 180 '<(DEPTH)/sandbox/sandbox.gyp:sandbox',
180 ], 181 ],
181 }], 182 }],
182 ], 183 ],
183 }, 184 },
184 { 185 {
185 'target_name': 'app_shell_browsertests', 186 'target_name': 'app_shell_browsertests',
186 'type': '<(gtest_target_type)', 187 'type': '<(gtest_target_type)',
187 'dependencies': [ 188 'dependencies': [
188 'app_shell_lib', 189 'app_shell_lib',
189 # TODO(yoz): find the right deps 190 # TODO(yoz): find the right deps
190 '<(DEPTH)/base/base.gyp:test_support_base', 191 '<(DEPTH)/base/base.gyp:test_support_base',
191 '<(DEPTH)/content/content.gyp:content_app_both', 192 '<(DEPTH)/content/content.gyp:content_app_both',
192 '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_suppo rt', 193 '<(DEPTH)/content/content_shell_and_tests.gyp:content_browser_test_suppo rt',
193 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content', 194 '<(DEPTH)/content/content_shell_and_tests.gyp:test_support_content',
194 '<(DEPTH)/testing/gtest.gyp:gtest', 195 '<(DEPTH)/testing/gtest.gyp:gtest',
195 ], 196 ],
196 'defines': [ 197 'defines': [
197 'HAS_OUT_OF_PROC_TEST_RUNNER', 198 'HAS_OUT_OF_PROC_TEST_RUNNER',
198 ], 199 ],
200 'msvs_large_pdb': 1,
199 'sources': [ 201 'sources': [
200 # TODO(yoz): Refactor once we have a second test target. 202 # TODO(yoz): Refactor once we have a second test target.
201 'browser/shell_browsertest.cc', 203 'browser/shell_browsertest.cc',
202 'test/shell_test.h', 204 'test/shell_test.h',
203 'test/shell_test.cc', 205 'test/shell_test.cc',
204 'test/shell_test_launcher_delegate.cc', 206 'test/shell_test_launcher_delegate.cc',
205 'test/shell_test_launcher_delegate.h', 207 'test/shell_test_launcher_delegate.h',
206 'test/shell_tests_main.cc', 208 'test/shell_tests_main.cc',
207 ], 209 ],
208 }, 210 },
209 ], # targets 211 ], # targets
210 } 212 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/build/get_landmines.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698