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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_shell.gypi ('k') | webkit/webkit_resources.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 87c3ad43dc2ba0f2a9ee02634b9acb7a6b06275f..77bcf723e828cd2f2bc46b5f594d888b867d8554 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1218,16 +1218,16 @@
# their various targets (net.gyp:net_resources, etc.),
# but that causes errors in other targets when
# resulting .res files get referenced multiple times.
+ '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc',
],
'dependencies': [
'<(DEPTH)/net/net.gyp:net_resources',
+ '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources',
'<(DEPTH)/third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'<(DEPTH)/third_party/isimpledom/isimpledom.gyp:isimpledom',
'<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
],
'configurations': {
'Debug_Base': {
« 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