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

Side by Side Diff: components/components_tests.gyp

Issue 423613003: Move strings from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chromecast/chromecast.gyp ('k') | content/DEPS » ('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 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 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
848 ], 848 ],
849 'sources': [ 849 'sources': [
850 '../content/shell/app/resource.h', 850 '../content/shell/app/resource.h',
851 '../content/shell/app/shell.rc', 851 '../content/shell/app/shell.rc',
852 # TODO: It would be nice to have these pulled in 852 # TODO: It would be nice to have these pulled in
853 # automatically from direct_dependent_settings in 853 # automatically from direct_dependent_settings in
854 # their various targets (net.gyp:net_resources, etc.), 854 # their various targets (net.gyp:net_resources, etc.),
855 # but that causes errors in other targets when 855 # but that causes errors in other targets when
856 # resulting .res files get referenced multiple times. 856 # resulting .res files get referenced multiple times.
857 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc es.rc', 857 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc es.rc',
858 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_ en-US.rc',
858 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 859 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
859 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
860 ], 860 ],
861 'dependencies': [ 861 'dependencies': [
862 '<(DEPTH)/content/app/strings/content_strings.gyp:content_string s',
862 '<(DEPTH)/net/net.gyp:net_resources', 863 '<(DEPTH)/net/net.gyp:net_resources',
863 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re sources', 864 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re sources',
864 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ', 865 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ',
865 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', 866 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
866 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', 867 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
867 ], 868 ],
868 'configurations': { 869 'configurations': {
869 'Debug_Base': { 870 'Debug_Base': {
870 'msvs_settings': { 871 'msvs_settings': {
871 'VCLinkerTool': { 872 'VCLinkerTool': {
872 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 873 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
873 }, 874 },
874 }, 875 },
875 }, 876 },
876 }, 877 },
877 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 878 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
878 'msvs_disabled_warnings': [ 4267, ], 879 'msvs_disabled_warnings': [ 4267, ],
879 }], 880 }],
880 ['OS=="win" and win_use_allocator_shim==1', { 881 ['OS=="win" and win_use_allocator_shim==1', {
881 'dependencies': [ 882 'dependencies': [
882 '../base/allocator/allocator.gyp:allocator', 883 '../base/allocator/allocator.gyp:allocator',
883 ], 884 ],
884 }], 885 }],
885 ], 886 ],
886 }, 887 },
887 ], 888 ],
888 }], 889 }],
889 ], 890 ],
890 } 891 }
OLDNEW
« no previous file with comments | « chromecast/chromecast.gyp ('k') | content/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698