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

Side by Side Diff: content/content_shell.gypi

Issue 109013004: Use icudat*.dat file on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add icudtl.dat only when icu_use_data_file_flag is set Created 7 years 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
« chrome/chrome_dll_bundle.gypi ('K') | « chrome/chrome_dll_bundle.gypi ('k') | no next file » | 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 { 5 {
6 'variables': { 6 'variables': {
7 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 '..', 397 '..',
398 ], 398 ],
399 'sources': [ 399 'sources': [
400 'app/startup_helper_win.cc', 400 'app/startup_helper_win.cc',
401 'shell/app/shell_main.cc', 401 'shell/app/shell_main.cc',
402 ], 402 ],
403 'mac_bundle_resources': [ 403 'mac_bundle_resources': [
404 'shell/app/app.icns', 404 'shell/app/app.icns',
405 'shell/app/app-Info.plist', 405 'shell/app/app-Info.plist',
406 ], 406 ],
407 'conditions': [
408 ['icu_use_data_file_flag', {
409 'mac_bundle_resources': [
410 '<(DEPTH)/third_party/icu/source/data/in/icudtl.dat',
411 ],
412 }],
413 ],
407 # TODO(mark): Come up with a fancier way to do this. It should only 414 # TODO(mark): Come up with a fancier way to do this. It should only
408 # be necessary to list app-Info.plist once, not the three times it is 415 # be necessary to list app-Info.plist once, not the three times it is
409 # listed here. 416 # listed here.
410 'mac_bundle_resources!': [ 417 'mac_bundle_resources!': [
411 'shell/app/app-Info.plist', 418 'shell/app/app-Info.plist',
412 ], 419 ],
413 'xcode_settings': { 420 'xcode_settings': {
414 'INFOPLIST_FILE': 'shell/app/app-Info.plist', 421 'INFOPLIST_FILE': 'shell/app/app-Info.plist',
415 }, 422 },
416 'msvs_settings': { 423 'msvs_settings': {
417 'VCLinkerTool': { 424 'VCLinkerTool': {
418 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 425 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
419 }, 426 },
420 'VCManifestTool': { 427 'VCManifestTool': {
421 'AdditionalManifestFiles': [ 428 'AdditionalManifestFiles': [
422 'shell/app/shell.exe.manifest', 429 'shell/app/shell.exe.manifest',
423 ], 430 ],
424 }, 431 },
425 }, 432 },
426 'conditions': [ 433 'conditions': [
Mark Mentovai 2013/12/18 20:02:57 This overwrites the “conditions” block on line 407
427 ['OS=="win" and win_use_allocator_shim==1', { 434 ['OS=="win" and win_use_allocator_shim==1', {
428 'dependencies': [ 435 'dependencies': [
429 '../base/allocator/allocator.gyp:allocator', 436 '../base/allocator/allocator.gyp:allocator',
430 ], 437 ],
431 }], 438 }],
432 ['OS=="win"', { 439 ['OS=="win"', {
433 'sources': [ 440 'sources': [
434 'shell/app/shell.rc', 441 'shell/app/shell.rc',
435 ], 442 ],
436 'configurations': { 443 'configurations': {
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 870 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
864 '--destination_dir', '<(dest_dir)', 871 '--destination_dir', '<(dest_dir)',
865 ], 872 ],
866 }, 873 },
867 ], 874 ],
868 }, 875 },
869 ], 876 ],
870 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 877 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
871 ] 878 ]
872 } 879 }
OLDNEW
« chrome/chrome_dll_bundle.gypi ('K') | « chrome/chrome_dll_bundle.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698