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

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: action 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
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 1204 matching lines...) Expand 10 before | Expand all | Expand 10 after
1215 ], 1215 ],
1216 'sources': [ 1216 'sources': [
1217 'shell/app/resource.h', 1217 'shell/app/resource.h',
1218 'shell/app/shell.rc', 1218 'shell/app/shell.rc',
1219 # TODO: It would be nice to have these pulled in 1219 # TODO: It would be nice to have these pulled in
1220 # automatically from direct_dependent_settings in 1220 # automatically from direct_dependent_settings in
1221 # their various targets (net.gyp:net_resources, etc.), 1221 # their various targets (net.gyp:net_resources, etc.),
1222 # but that causes errors in other targets when 1222 # but that causes errors in other targets when
1223 # resulting .res files get referenced multiple times. 1223 # resulting .res files get referenced multiple times.
1224 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc es.rc', 1224 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc es.rc',
1225 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_ en-US.rc',
1225 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 1226 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
1226 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
1227 ], 1227 ],
1228 'dependencies': [ 1228 'dependencies': [
1229 '<(DEPTH)/content/app/strings/content_strings.gyp:content_string s',
1229 '<(DEPTH)/net/net.gyp:net_resources', 1230 '<(DEPTH)/net/net.gyp:net_resources',
1230 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re sources', 1231 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re sources',
1231 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ', 1232 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ',
1232 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', 1233 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
1233 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
1234 ], 1234 ],
1235 'configurations': { 1235 'configurations': {
1236 'Debug_Base': { 1236 'Debug_Base': {
1237 'msvs_settings': { 1237 'msvs_settings': {
1238 'VCLinkerTool': { 1238 'VCLinkerTool': {
1239 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 1239 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
1240 }, 1240 },
1241 }, 1241 },
1242 }, 1242 },
1243 }, 1243 },
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
1863 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1863 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1864 }, 1864 },
1865 ], 1865 ],
1866 }], 1866 }],
1867 ], 1867 ],
1868 }, 1868 },
1869 ], 1869 ],
1870 }], 1870 }],
1871 ], 1871 ],
1872 } 1872 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698