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

Side by Side Diff: chrome/chrome_dll.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 | « no previous file | chrome/chrome_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) 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 'conditions': [ 5 'conditions': [
6 ['OS=="mac" or OS=="win"', { 6 ['OS=="mac" or OS=="win"', {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'chrome_dll', 9 'target_name': 'chrome_dll',
10 'type': 'none', 10 'type': 'none',
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 97
98 # TODO: It would be nice to have these pulled in 98 # TODO: It would be nice to have these pulled in
99 # automatically from direct_dependent_settings in 99 # automatically from direct_dependent_settings in
100 # their various targets (net.gyp:net_resources, etc.), 100 # their various targets (net.gyp:net_resources, etc.),
101 # but that causes errors in other targets when 101 # but that causes errors in other targets when
102 # resulting .res files get referenced multiple times. 102 # resulting .res files get referenced multiple times.
103 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 103 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
104 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc' , 104 '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.rc' ,
105 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 105 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
106 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 106 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
107 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
108 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 107 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
109 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 108 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
110 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' , 109 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
111 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
112 110
113 # TODO(sgk): left-over from pre-gyp build, figure out 111 # TODO(sgk): left-over from pre-gyp build, figure out
114 # if we still need them and/or how to update to gyp. 112 # if we still need them and/or how to update to gyp.
115 #'app/check_dependents.bat', 113 #'app/check_dependents.bat',
116 #'app/chrome.dll.deps', 114 #'app/chrome.dll.deps',
117 ], 115 ],
118 'include_dirs': [ 116 'include_dirs': [
119 '<(DEPTH)/third_party/wtl/include', 117 '<(DEPTH)/third_party/wtl/include',
120 ], 118 ],
121 'defines': [ 119 'defines': [
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 ], 226 ],
229 }], 227 }],
230 ], # conditions 228 ], # conditions
231 }], # OS=="mac" 229 }], # OS=="mac"
232 ], # conditions 230 ], # conditions
233 }, # target chrome_dll 231 }, # target chrome_dll
234 ], # targets 232 ], # targets
235 }], # OS=="mac" or OS=="win" 233 }], # OS=="mac" or OS=="win"
236 ], 234 ],
237 } 235 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698