| 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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS | 332 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS |
| 333 }, | 333 }, |
| 334 }, | 334 }, |
| 335 'conditions': [ | 335 'conditions': [ |
| 336 ['OS=="win" and win_use_allocator_shim==1', { | 336 ['OS=="win" and win_use_allocator_shim==1', { |
| 337 'dependencies': [ | 337 'dependencies': [ |
| 338 '../base/allocator/allocator.gyp:allocator', | 338 '../base/allocator/allocator.gyp:allocator', |
| 339 ], | 339 ], |
| 340 }], | 340 }], |
| 341 ['OS=="win"', { | 341 ['OS=="win"', { |
| 342 'dependencies': [ |
| 343 'content_user32_delay_imports', |
| 344 ], |
| 342 'sources': [ | 345 'sources': [ |
| 343 'shell/shell.rc', | 346 'shell/shell.rc', |
| 344 ], | 347 ], |
| 345 'configurations': { | 348 'configurations': { |
| 346 'Debug_Base': { | 349 'Debug_Base': { |
| 347 'msvs_settings': { | 350 'msvs_settings': { |
| 348 'VCLinkerTool': { | 351 'VCLinkerTool': { |
| 349 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 352 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
| 350 }, | 353 }, |
| 351 }, | 354 }, |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 664 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi
ew.so'], | 667 'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_vi
ew.so'], |
| 665 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont
ent_shell.pak'], | 668 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/cont
ent_shell.pak'], |
| 666 'asset_location': '<(ant_build_out)/content_shell/assets', | 669 'asset_location': '<(ant_build_out)/content_shell/assets', |
| 667 }, | 670 }, |
| 668 'includes': [ '../build/java_apk.gypi' ], | 671 'includes': [ '../build/java_apk.gypi' ], |
| 669 }, | 672 }, |
| 670 ], | 673 ], |
| 671 }], # OS=="android" | 674 }], # OS=="android" |
| 672 ] | 675 ] |
| 673 } | 676 } |
| OLD | NEW |