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

Side by Side Diff: content/content_tests.gypi

Issue 398243002: Fix the path to blink_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 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/webkit_resources.gyp » ('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 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1211 '<(SHARED_INTERMEDIATE_DIR)/webkit', 1211 '<(SHARED_INTERMEDIATE_DIR)/webkit',
1212 ], 1212 ],
1213 'sources': [ 1213 'sources': [
1214 'shell/app/resource.h', 1214 'shell/app/resource.h',
1215 'shell/app/shell.rc', 1215 'shell/app/shell.rc',
1216 # TODO: It would be nice to have these pulled in 1216 # TODO: It would be nice to have these pulled in
1217 # automatically from direct_dependent_settings in 1217 # automatically from direct_dependent_settings in
1218 # their various targets (net.gyp:net_resources, etc.), 1218 # their various targets (net.gyp:net_resources, etc.),
1219 # but that causes errors in other targets when 1219 # but that causes errors in other targets when
1220 # resulting .res files get referenced multiple times. 1220 # resulting .res files get referenced multiple times.
1221 '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resourc es.rc',
1221 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', 1222 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
1222 '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
1223 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', 1223 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
1224 ], 1224 ],
1225 'dependencies': [ 1225 'dependencies': [
1226 '<(DEPTH)/net/net.gyp:net_resources', 1226 '<(DEPTH)/net/net.gyp:net_resources',
1227 '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_re sources',
1227 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ', 1228 '<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2 ',
1228 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom', 1229 '<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
1229 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', 1230 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
1230 '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
1231 ], 1231 ],
1232 'configurations': { 1232 'configurations': {
1233 'Debug_Base': { 1233 'Debug_Base': {
1234 'msvs_settings': { 1234 'msvs_settings': {
1235 'VCLinkerTool': { 1235 'VCLinkerTool': {
1236 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 1236 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
1237 }, 1237 },
1238 }, 1238 },
1239 }, 1239 },
1240 }, 1240 },
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
1865 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'], 1865 'files': ['<(PRODUCT_DIR)/libnpapi_test_plugin.so'],
1866 }, 1866 },
1867 ], 1867 ],
1868 }], 1868 }],
1869 ], 1869 ],
1870 }, 1870 },
1871 ], 1871 ],
1872 }], 1872 }],
1873 ], 1873 ],
1874 } 1874 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | webkit/webkit_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698