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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 11418003: Remove rc file for scaled resource pak (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: keep webkit_resources for DumpRenderTree Created 8 years, 1 month 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 | « chrome/chrome_tests.gypi ('k') | chrome/renderer/resources/renderer_resources.grd » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'targets': [ 5 'targets': [
6 { 6 {
7 # This target contains mocks and test utilities that don't belong in 7 # This target contains mocks and test utilities that don't belong in
8 # production libraries but are used by more than one test executable. 8 # production libraries but are used by more than one test executable.
9 'target_name': 'test_support_common', 9 'target_name': 'test_support_common',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 1978 matching lines...) Expand 10 before | Expand all | Expand 10 after
1989 ], 1989 ],
1990 'sources': [ 1990 'sources': [
1991 # TODO: It would be nice to have these pulled in 1991 # TODO: It would be nice to have these pulled in
1992 # automatically from direct_dependent_settings in 1992 # automatically from direct_dependent_settings in
1993 # their various targets (net.gyp:net_resources, etc.), 1993 # their various targets (net.gyp:net_resources, etc.),
1994 # but that causes errors in other targets when 1994 # but that causes errors in other targets when
1995 # resulting .res files get referenced multiple times. 1995 # resulting .res files get referenced multiple times.
1996 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 1996 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
1997 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 1997 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
1998 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 1998 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
1999 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
2000 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', 1999 '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
2001 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 2000 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
2002 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_st rings.rc', 2001 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_st rings.rc',
2003 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 2002 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
2004 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc', 2003 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
2005 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
2006 ], 2004 ],
2007 'link_settings': { 2005 'link_settings': {
2008 'libraries': [ 2006 'libraries': [
2009 '-lcomsupp.lib', 2007 '-lcomsupp.lib',
2010 '-loleacc.lib', 2008 '-loleacc.lib',
2011 '-lrpcrt4.lib', 2009 '-lrpcrt4.lib',
2012 '-lurlmon.lib', 2010 '-lurlmon.lib',
2013 '-lwinmm.lib', 2011 '-lwinmm.lib',
2014 ], 2012 ],
2015 }, 2013 },
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
2265 'unit_tests.isolate', 2263 'unit_tests.isolate',
2266 ], 2264 ],
2267 'sources': [ 2265 'sources': [
2268 'unit_tests.isolate', 2266 'unit_tests.isolate',
2269 ], 2267 ],
2270 }, 2268 },
2271 ], 2269 ],
2272 }], 2270 }],
2273 ], # 'conditions' 2271 ], # 'conditions'
2274 } 2272 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/renderer/resources/renderer_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698