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

Side by Side Diff: content/content_shell.gypi

Issue 19275010: Embed compatibility manifest into all *.exe files (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: style fix Created 7 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
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | content/shell/app/shell.exe.manifest » ('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 { 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 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 'shell/app/app-Info.plist', 375 'shell/app/app-Info.plist',
376 ], 376 ],
377 'xcode_settings': { 377 'xcode_settings': {
378 'INFOPLIST_FILE': 'shell/app/app-Info.plist', 378 'INFOPLIST_FILE': 'shell/app/app-Info.plist',
379 }, 379 },
380 'msvs_settings': { 380 'msvs_settings': {
381 'VCLinkerTool': { 381 'VCLinkerTool': {
382 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 382 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
383 }, 383 },
384 'VCManifestTool': { 384 'VCManifestTool': {
385 'AdditionalManifestFiles': 'shell/app/shell.exe.manifest', 385 'AdditionalManifestFiles': [
386 'shell/app/shell.exe.manifest',
387 ],
386 }, 388 },
387 }, 389 },
388 'conditions': [ 390 'conditions': [
389 ['OS=="win" and win_use_allocator_shim==1', { 391 ['OS=="win" and win_use_allocator_shim==1', {
390 'dependencies': [ 392 'dependencies': [
391 '../base/allocator/allocator.gyp:allocator', 393 '../base/allocator/allocator.gyp:allocator',
392 ], 394 ],
393 }], 395 }],
394 ['OS=="win"', { 396 ['OS=="win"', {
395 'sources': [ 397 'sources': [
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 'native_lib_target': 'libcontent_shell_content_view', 720 'native_lib_target': 'libcontent_shell_content_view',
719 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'], 721 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont ent_shell.pak'],
720 'asset_location': '<(ant_build_out)/content_shell/assets', 722 'asset_location': '<(ant_build_out)/content_shell/assets',
721 }, 723 },
722 'includes': [ '../build/java_apk.gypi' ], 724 'includes': [ '../build/java_apk.gypi' ],
723 }, 725 },
724 ], 726 ],
725 }], # OS=="android" 727 }], # OS=="android"
726 ] 728 ]
727 } 729 }
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame.gyp ('k') | content/shell/app/shell.exe.manifest » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698