OLD | NEW |
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 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 'mac_bundle_resources!': [ | 355 'mac_bundle_resources!': [ |
356 'shell/app/app-Info.plist', | 356 'shell/app/app-Info.plist', |
357 ], | 357 ], |
358 'xcode_settings': { | 358 'xcode_settings': { |
359 'INFOPLIST_FILE': 'shell/app/app-Info.plist', | 359 'INFOPLIST_FILE': 'shell/app/app-Info.plist', |
360 }, | 360 }, |
361 'msvs_settings': { | 361 'msvs_settings': { |
362 'VCLinkerTool': { | 362 'VCLinkerTool': { |
363 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 363 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
364 }, | 364 }, |
| 365 'VCManifestTool': { |
| 366 'AdditionalManifestFiles': 'shell/app/shell.exe.manifest', |
| 367 }, |
365 }, | 368 }, |
366 'conditions': [ | 369 'conditions': [ |
367 ['OS=="win" and win_use_allocator_shim==1', { | 370 ['OS=="win" and win_use_allocator_shim==1', { |
368 'dependencies': [ | 371 'dependencies': [ |
369 '../base/allocator/allocator.gyp:allocator', | 372 '../base/allocator/allocator.gyp:allocator', |
370 ], | 373 ], |
371 }], | 374 }], |
372 ['OS=="win"', { | 375 ['OS=="win"', { |
373 'sources': [ | 376 'sources': [ |
374 'shell/app/shell.rc', | 377 'shell/app/shell.rc', |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
695 'native_lib_target': 'libcontent_shell_content_view', | 698 'native_lib_target': 'libcontent_shell_content_view', |
696 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont
ent_shell.pak'], | 699 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont
ent_shell.pak'], |
697 'asset_location': '<(ant_build_out)/content_shell/assets', | 700 'asset_location': '<(ant_build_out)/content_shell/assets', |
698 }, | 701 }, |
699 'includes': [ '../build/java_apk.gypi' ], | 702 'includes': [ '../build/java_apk.gypi' ], |
700 }, | 703 }, |
701 ], | 704 ], |
702 }], # OS=="android" | 705 }], # OS=="android" |
703 ] | 706 ] |
704 } | 707 } |
OLD | NEW |