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

Side by Side Diff: content/content_tests.gypi

Issue 17472006: Move webkit_resources / webkit_strings targets out of webkit_support.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | « content/content_shell.gypi ('k') | webkit/common/webkit_common.gypi » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 # but that causes errors in other targets when 884 # but that causes errors in other targets when
885 # resulting .res files get referenced multiple times. 885 # resulting .res files get referenced multiple times.
886 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 886 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
887 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' , 887 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc' ,
888 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', 888 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
889 ], 889 ],
890 'dependencies': [ 890 'dependencies': [
891 '<(DEPTH)/net/net.gyp:net_resources', 891 '<(DEPTH)/net/net.gyp:net_resources',
892 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ', 892 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ',
893 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', 893 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
894 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources', 894 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
895 '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings', 895 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
896 ], 896 ],
897 'configurations': { 897 'configurations': {
898 'Debug_Base': { 898 'Debug_Base': {
899 'msvs_settings': { 899 'msvs_settings': {
900 'VCLinkerTool': { 900 'VCLinkerTool': {
901 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 901 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
902 }, 902 },
903 }, 903 },
904 }, 904 },
905 }, 905 },
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 'resource_dir': 'shell/android/shell_apk/res', 1221 'resource_dir': 'shell/android/shell_apk/res',
1222 'additional_src_dirs': ['public/android/javatests/',], 1222 'additional_src_dirs': ['public/android/javatests/',],
1223 'is_test_apk': 1, 1223 'is_test_apk': 1,
1224 }, 1224 },
1225 'includes': [ '../build/java_apk.gypi' ], 1225 'includes': [ '../build/java_apk.gypi' ],
1226 }, 1226 },
1227 ], 1227 ],
1228 }], 1228 }],
1229 ], 1229 ],
1230 } 1230 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | webkit/common/webkit_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698