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

Side by Side Diff: content/content_tests.gypi

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 | « content/content_shell.gypi ('k') | content/shell/BUILD.gn » ('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 'variables': { 6 'variables': {
7 'layouttest_support_content_sources': [ 7 'layouttest_support_content_sources': [
8 'public/test/layouttest_support.h', 8 'public/test/layouttest_support.h',
9 'public/test/nested_message_pump_android.cc', 9 'public/test/nested_message_pump_android.cc',
10 'public/test/nested_message_pump_android.h', 10 'public/test/nested_message_pump_android.h',
(...skipping 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1218 ], 1218 ],
1219 'sources': [ 1219 'sources': [
1220 'shell/app/resource.h', 1220 'shell/app/resource.h',
1221 'shell/app/shell.rc', 1221 'shell/app/shell.rc',
1222 # TODO: It would be nice to have these pulled in 1222 # TODO: It would be nice to have these pulled in
1223 # automatically from direct_dependent_settings in 1223 # automatically from direct_dependent_settings in
1224 # their various targets (net.gyp:net_resources, etc.), 1224 # their various targets (net.gyp:net_resources, etc.),
1225 # but that causes errors in other targets when 1225 # but that causes errors in other targets when
1226 # resulting .res files get referenced multiple times. 1226 # resulting .res files get referenced multiple times.
1227 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc es.rc', 1227 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc es.rc',
1228 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_ en-US.rc',
1228 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 1229 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
1229 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
1230 ], 1230 ],
1231 'dependencies': [ 1231 'dependencies': [
1232 '<(DEPTH)/content/app/strings/content_strings.gyp:content_string s',
1232 '<(DEPTH)/net/net.gyp:net_resources', 1233 '<(DEPTH)/net/net.gyp:net_resources',
1233 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re sources', 1234 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re sources',
1234 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ', 1235 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ',
1235 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', 1236 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
1236 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
1237 ], 1237 ],
1238 'configurations': { 1238 'configurations': {
1239 'Debug_Base': { 1239 'Debug_Base': {
1240 'msvs_settings': { 1240 'msvs_settings': {
1241 'VCLinkerTool': { 1241 'VCLinkerTool': {
1242 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 1242 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
1243 }, 1243 },
1244 }, 1244 },
1245 }, 1245 },
1246 }, 1246 },
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
1866 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1866 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1867 }, 1867 },
1868 ], 1868 ],
1869 }], 1869 }],
1870 ], 1870 ],
1871 }, 1871 },
1872 ], 1872 ],
1873 }], 1873 }],
1874 ], 1874 ],
1875 } 1875 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | content/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698