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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 10820003: Remove ui_resources_default_100_percent.rc and theme_resources_default_100_percent.rc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 5 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 | « chrome/app/theme/theme_resources.grd ('k') | 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 # TODO: It would be nice to have these pulled in 92 # TODO: It would be nice to have these pulled in
93 # automatically from direct_dependent_settings in 93 # automatically from direct_dependent_settings in
94 # their various targets (net.gyp:net_resources, etc.), 94 # their various targets (net.gyp:net_resources, etc.),
95 # but that causes errors in other targets when 95 # but that causes errors in other targets when
96 # resulting .res files get referenced multiple times. 96 # resulting .res files get referenced multiple times.
97 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 97 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
98 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 98 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
99 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', 99 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
100 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 100 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
101 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.r c',
102 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', 101 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
103 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 102 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
104 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_per cent.rc',
105 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' , 103 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
106 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 104 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
107 105
108 # TODO(sgk): left-over from pre-gyp build, figure out 106 # TODO(sgk): left-over from pre-gyp build, figure out
109 # if we still need them and/or how to update to gyp. 107 # if we still need them and/or how to update to gyp.
110 #'app/check_dependents.bat', 108 #'app/check_dependents.bat',
111 #'app/chrome.dll.deps', 109 #'app/chrome.dll.deps',
112 ], 110 ],
113 'include_dirs': [ 111 'include_dirs': [
114 '<(DEPTH)/third_party/wtl/include', 112 '<(DEPTH)/third_party/wtl/include',
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 ], 537 ],
540 }], 538 }],
541 ], # conditions 539 ], # conditions
542 }], # OS=="mac" 540 }], # OS=="mac"
543 ], # conditions 541 ], # conditions
544 }, # target chrome_dll 542 }, # target chrome_dll
545 ], # targets 543 ], # targets
546 }], # OS=="mac" or OS=="win" 544 }], # OS=="mac" or OS=="win"
547 ], 545 ],
548 } 546 }
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698