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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 7663001: Make bubble_border use resources under ui/resources. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge Created 9 years, 4 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/chrome_common.gypi ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 5 'target_defaults': {
6 'variables': { 6 'variables': {
7 'chrome_dll_target': 0, 7 'chrome_dll_target': 0,
8 }, 8 },
9 'target_conditions': [ 9 'target_conditions': [
10 ['chrome_dll_target==1', { 10 ['chrome_dll_target==1', {
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 # resulting .res files get referenced multiple times. 128 # resulting .res files get referenced multiple times.
129 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 129 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
130 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 130 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
131 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 131 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
132 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 132 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
133 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 133 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
134 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', 134 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
135 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 135 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
136 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 136 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
137 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 137 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
138 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resource s_standard.rc',
138 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' , 139 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
139 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 140 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
140 141
141 # TODO(sgk): left-over from pre-gyp build, figure out 142 # TODO(sgk): left-over from pre-gyp build, figure out
142 # if we still need them and/or how to update to gyp. 143 # if we still need them and/or how to update to gyp.
143 #'app/check_dependents.bat', 144 #'app/check_dependents.bat',
144 #'app/chrome.dll.deps', 145 #'app/chrome.dll.deps',
145 ], 146 ],
146 'msvs_settings': { 147 'msvs_settings': {
147 'VCLinkerTool': { 148 'VCLinkerTool': {
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 'pak_inputs': [ 337 'pak_inputs': [
337 '<(grit_out_dir)/autofill_resources.pak', 338 '<(grit_out_dir)/autofill_resources.pak',
338 '<(grit_out_dir)/browser_resources.pak', 339 '<(grit_out_dir)/browser_resources.pak',
339 '<(grit_out_dir)/common_resources.pak', 340 '<(grit_out_dir)/common_resources.pak',
340 '<(grit_out_dir)/default_plugin_resources/default_plugin_r esources.pak', 341 '<(grit_out_dir)/default_plugin_resources/default_plugin_r esources.pak',
341 '<(grit_out_dir)/renderer_resources.pak', 342 '<(grit_out_dir)/renderer_resources.pak',
342 '<(grit_out_dir)/theme_resources.pak', 343 '<(grit_out_dir)/theme_resources.pak',
343 '<(grit_out_dir)/theme_resources_standard.pak', 344 '<(grit_out_dir)/theme_resources_standard.pak',
344 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 345 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
345 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.p ak', 346 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.p ak',
347 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_re sources_standard.pak',
346 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resourc es.pak', 348 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resourc es.pak',
347 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 349 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
348 ], 350 ],
349 }, 351 },
350 'inputs': [ 352 'inputs': [
351 '<(repack_path)', 353 '<(repack_path)',
352 '<@(pak_inputs)', 354 '<@(pak_inputs)',
353 ], 355 ],
354 'outputs': [ 356 'outputs': [
355 '<(INTERMEDIATE_DIR)/repack/chrome.pak', 357 '<(INTERMEDIATE_DIR)/repack/chrome.pak',
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 'LinkIncremental': '<(msvs_debug_link_nonincremental)', 734 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
733 }, 735 },
734 }, 736 },
735 }, 737 },
736 }, 738 },
737 }, # target chrome_dll 739 }, # target chrome_dll
738 ], 740 ],
739 }], 741 }],
740 ], 742 ],
741 } 743 }
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698