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

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: Fixed touchui 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
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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 # automatically from direct_dependent_settings in 109 # automatically from direct_dependent_settings in
110 # their various targets (net.gyp:net_resources, etc.), 110 # their various targets (net.gyp:net_resources, etc.),
111 # but that causes errors in other targets when 111 # but that causes errors in other targets when
112 # resulting .res files get referenced multiple times. 112 # resulting .res files get referenced multiple times.
113 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc', 113 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
114 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc', 114 '<(SHARED_INTERMEDIATE_DIR)/chrome/autofill_resources.rc',
115 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', 115 '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
116 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', 116 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
117 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', 117 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
118 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc', 118 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
119 '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
119 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 120 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
120 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' , 121 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
121 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', 122 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
122 123
123 # TODO(sgk): left-over from pre-gyp build, figure out 124 # TODO(sgk): left-over from pre-gyp build, figure out
124 # if we still need them and/or how to update to gyp. 125 # if we still need them and/or how to update to gyp.
125 #'app/check_dependents.bat', 126 #'app/check_dependents.bat',
126 #'app/chrome.dll.deps', 127 #'app/chrome.dll.deps',
127 ], 128 ],
128 'msvs_settings': { 129 'msvs_settings': {
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 { 312 {
312 'action_name': 'repack_chrome', 313 'action_name': 'repack_chrome',
313 'variables': { 314 'variables': {
314 'pak_inputs': [ 315 'pak_inputs': [
315 '<(grit_out_dir)/autofill_resources.pak', 316 '<(grit_out_dir)/autofill_resources.pak',
316 '<(grit_out_dir)/browser_resources.pak', 317 '<(grit_out_dir)/browser_resources.pak',
317 '<(grit_out_dir)/common_resources.pak', 318 '<(grit_out_dir)/common_resources.pak',
318 '<(grit_out_dir)/default_plugin_resources/default_plugin_r esources.pak', 319 '<(grit_out_dir)/default_plugin_resources/default_plugin_r esources.pak',
319 '<(grit_out_dir)/renderer_resources.pak', 320 '<(grit_out_dir)/renderer_resources.pak',
320 '<(grit_out_dir)/theme_resources.pak', 321 '<(grit_out_dir)/theme_resources.pak',
322 '<(grit_out_dir)/theme_resources_standard.pak',
321 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resource s.pak', 323 '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resource s.pak',
322 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 324 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
323 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resourc es.pak', 325 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resourc es.pak',
324 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 326 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
325 ], 327 ],
326 }, 328 },
327 'inputs': [ 329 'inputs': [
328 '<(repack_path)', 330 '<(repack_path)',
329 '<@(pak_inputs)', 331 '<@(pak_inputs)',
330 ], 332 ],
331 'outputs': [ 333 'outputs': [
332 '<(INTERMEDIATE_DIR)/repack/chrome.pak', 334 '<(INTERMEDIATE_DIR)/repack/chrome.pak',
333 ], 335 ],
334 'action': ['python', '<(repack_path)', '<@(_outputs)', 336 'action': ['python', '<(repack_path)', '<@(_outputs)',
335 '<@(pak_inputs)'], 337 '<@(pak_inputs)'],
336 'process_outputs_as_mac_bundle_resources': 1, 338 'process_outputs_as_mac_bundle_resources': 1,
337 }, 339 },
338 { 340 {
341 'action_name': 'repack_theme_resources_large',
342 'variables': {
343 'pak_inputs': [
344 '<(grit_out_dir)/theme_resources_large.pak',
345 ],
346 },
347 'inputs': [
348 '<(repack_path)',
349 '<@(pak_inputs)',
350 ],
351 'outputs': [
352 '<(INTERMEDIATE_DIR)/repack/theme_resources_large.pak',
353 ],
354 'action': ['python', '<(repack_path)', '<@(_outputs)',
355 '<@(pak_inputs)'],
356 'process_outputs_as_mac_bundle_resources': 1,
357 },
358 {
339 'action_name': 'repack_locales', 359 'action_name': 'repack_locales',
340 'process_outputs_as_mac_bundle_resources': 1, 360 'process_outputs_as_mac_bundle_resources': 1,
341 'variables': { 361 'variables': {
342 'conditions': [ 362 'conditions': [
343 ['branding=="Chrome"', { 363 ['branding=="Chrome"', {
344 'branding_flag': ['-b', 'google_chrome',], 364 'branding_flag': ['-b', 'google_chrome',],
345 }, { # else: branding!="Chrome" 365 }, { # else: branding!="Chrome"
346 'branding_flag': ['-b', 'chromium',], 366 'branding_flag': ['-b', 'chromium',],
347 }], 367 }],
348 ], 368 ],
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 'LinkIncremental': '<(msvs_debug_link_nonincremental)', 642 'LinkIncremental': '<(msvs_debug_link_nonincremental)',
623 }, 643 },
624 }, 644 },
625 }, 645 },
626 }, 646 },
627 }, # target chrome_dll 647 }, # target chrome_dll
628 ], 648 ],
629 }], 649 }],
630 ], 650 ],
631 } 651 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698