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

Side by Side Diff: chrome/chrome_dll.gypi

Issue 6849030: Add support for multi resolution icons (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added comments Created 9 years, 8 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 # automatically from direct_dependent_settings in 110 # automatically from direct_dependent_settings in
111 # their various targets (net.gyp:net_resources, etc.), 111 # their various targets (net.gyp:net_resources, etc.),
112 # but that causes errors in other targets when 112 # but that causes errors in other targets when
113 # resulting .res files get referenced multiple times. 113 # resulting .res files get referenced multiple times.
114 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', 114 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
115 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 115 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
116 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 116 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
117 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 117 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
118 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 118 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
119 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 119 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
120 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
120 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 121 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
121 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' , 122 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
122 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 123 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
123 124
124 # TODO(sgk): left-over from pre-gyp build, figure out 125 # TODO(sgk): left-over from pre-gyp build, figure out
125 # if we still need them and/or how to update to gyp. 126 # if we still need them and/or how to update to gyp.
126 #'app/check_dependents.bat', 127 #'app/check_dependents.bat',
127 #'app/chrome.dll.deps', 128 #'app/chrome.dll.deps',
128 ], 129 ],
129 'msvs_settings': { 130 'msvs_settings': {
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 { 315 {
315 'action_name': 'repack_chrome', 316 'action_name': 'repack_chrome',
316 'variables': { 317 'variables': {
317 'pak_inputs': [ 318 'pak_inputs': [
318 '<(grit_out_dir)/autofill_resources.pak', 319 '<(grit_out_dir)/autofill_resources.pak',
319 '<(grit_out_dir)/browser_resources.pak', 320 '<(grit_out_dir)/browser_resources.pak',
320 '<(grit_out_dir)/common_resources.pak', 321 '<(grit_out_dir)/common_resources.pak',
321 '<(grit_out_dir)/default_plugin_resources/default_plugin_r esources.pak', 322 '<(grit_out_dir)/default_plugin_resources/default_plugin_r esources.pak',
322 '<(grit_out_dir)/renderer_resources.pak', 323 '<(grit_out_dir)/renderer_resources.pak',
323 '<(grit_out_dir)/theme_resources.pak', 324 '<(grit_out_dir)/theme_resources.pak',
325 '<(grit_out_dir)/theme_resources_standard.pak',
324 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resource s.pak', 326 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resource s.pak',
325 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 327 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
326 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resourc es.pak', 328 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resourc es.pak',
327 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 329 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
328 ], 330 ],
329 }, 331 },
330 'inputs': [ 332 'inputs': [
331 '<(repack_path)', 333 '<(repack_path)',
332 '<@(pak_inputs)', 334 '<@(pak_inputs)',
333 ], 335 ],
334 'outputs': [ 336 'outputs': [
335 '<(INTERMEDIATE_DIR)/repack/chrome.pak', 337 '<(INTERMEDIATE_DIR)/repack/chrome.pak',
336 ], 338 ],
337 'action': ['python', '<(repack_path)', '<@(_outputs)', 339 'action': ['python', '<(repack_path)', '<@(_outputs)',
338 '<@(pak_inputs)'], 340 '<@(pak_inputs)'],
339 'process_outputs_as_mac_bundle_resources': 1, 341 'process_outputs_as_mac_bundle_resources': 1,
340 }, 342 },
341 { 343 {
344 'action_name': 'repack_theme_resources_large',
345 'variables': {
346 'pak_inputs': [
347 '<(grit_out_dir)/theme_resources_large.pak',
348 ],
349 },
350 'inputs': [
351 '<(repack_path)',
352 '<@(pak_inputs)',
353 ],
354 'outputs': [
355 '<(INTERMEDIATE_DIR)/repack/theme_resources_large.pak',
356 ],
357 'action': ['python', '<(repack_path)', '<@(_outputs)',
358 '<@(pak_inputs)'],
359 'process_outputs_as_mac_bundle_resources': 1,
360 },
361 {
342 'action_name': 'repack_locales', 362 'action_name': 'repack_locales',
343 'process_outputs_as_mac_bundle_resources': 1, 363 'process_outputs_as_mac_bundle_resources': 1,
344 'variables': { 364 'variables': {
345 'conditions': [ 365 'conditions': [
346 ['branding=="Chrome"', { 366 ['branding=="Chrome"', {
347 'branding_flag': ['-b', 'google_chrome',], 367 'branding_flag': ['-b', 'google_chrome',],
348 }, { # else: branding!="Chrome" 368 }, { # else: branding!="Chrome"
349 'branding_flag': ['-b', 'chromium',], 369 'branding_flag': ['-b', 'chromium',],
350 }], 370 }],
351 ], 371 ],
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 'LinkIncremental': '<(msvs_debug_link_nonincremental)', 649 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
630 }, 650 },
631 }, 651 },
632 }, 652 },
633 }, 653 },
634 }, # target chrome_dll 654 }, # target chrome_dll
635 ], 655 ],
636 }], 656 }],
637 ], 657 ],
638 } 658 }
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