OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 # This turns on e.g. the filename-based detection of which | 7 # This turns on e.g. the filename-based detection of which |
8 # platforms to include source files on (e.g. files ending in | 8 # platforms to include source files on (e.g. files ending in |
9 # _mac.h or _mac.cc are only compiled on MacOSX). | 9 # _mac.h or _mac.cc are only compiled on MacOSX). |
10 'chromium_code': 1, | 10 'chromium_code': 1, |
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
817 '<(SHARED_INTERMEDIATE_DIR)/webkit', | 817 '<(SHARED_INTERMEDIATE_DIR)/webkit', |
818 ], | 818 ], |
819 'sources': [ | 819 'sources': [ |
820 '../content/shell/app/resource.h', | 820 '../content/shell/app/resource.h', |
821 '../content/shell/app/shell.rc', | 821 '../content/shell/app/shell.rc', |
822 # TODO: It would be nice to have these pulled in | 822 # TODO: It would be nice to have these pulled in |
823 # automatically from direct_dependent_settings in | 823 # automatically from direct_dependent_settings in |
824 # their various targets (net.gyp:net_resources, etc.), | 824 # their various targets (net.gyp:net_resources, etc.), |
825 # but that causes errors in other targets when | 825 # but that causes errors in other targets when |
826 # resulting .res files get referenced multiple times. | 826 # resulting .res files get referenced multiple times. |
| 827 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc
es.rc', |
827 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', | 828 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', |
828 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc', | |
829 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', | 829 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', |
830 ], | 830 ], |
831 'dependencies': [ | 831 'dependencies': [ |
832 '<(DEPTH)/net/net.gyp:net_resources', | 832 '<(DEPTH)/net/net.gyp:net_resources', |
| 833 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re
sources', |
833 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2
', | 834 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2
', |
834 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', | 835 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', |
835 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', | |
836 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', | 836 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', |
837 ], | 837 ], |
838 'configurations': { | 838 'configurations': { |
839 'Debug_Base': { | 839 'Debug_Base': { |
840 'msvs_settings': { | 840 'msvs_settings': { |
841 'VCLinkerTool': { | 841 'VCLinkerTool': { |
842 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', | 842 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', |
843 }, | 843 }, |
844 }, | 844 }, |
845 }, | 845 }, |
846 }, | 846 }, |
847 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 847 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
848 'msvs_disabled_warnings': [ 4267, ], | 848 'msvs_disabled_warnings': [ 4267, ], |
849 }], | 849 }], |
850 ['OS=="win" and win_use_allocator_shim==1', { | 850 ['OS=="win" and win_use_allocator_shim==1', { |
851 'dependencies': [ | 851 'dependencies': [ |
852 '../base/allocator/allocator.gyp:allocator', | 852 '../base/allocator/allocator.gyp:allocator', |
853 ], | 853 ], |
854 }], | 854 }], |
855 ], | 855 ], |
856 }, | 856 }, |
857 ], | 857 ], |
858 }], | 858 }], |
859 ], | 859 ], |
860 } | 860 } |
OLD | NEW |