summaryrefslogtreecommitdiffstats
path: root/content/content_shell.gypi
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-09 21:35:41 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-09 21:35:41 +0000
commitd7871acd1481526512521cf07920c396e09977f0 (patch)
tree4a8e98925b534c57e72363ddcfdf94592328a3cf /content/content_shell.gypi
parent12079e31a9d9042511deaf8f1ce31048b76932e8 (diff)
downloadchromium_src-d7871acd1481526512521cf07920c396e09977f0.zip
chromium_src-d7871acd1481526512521cf07920c396e09977f0.tar.gz
chromium_src-d7871acd1481526512521cf07920c396e09977f0.tar.bz2
Rename webkit_(resources|strings) targets to remove _temp infix
This is part 3 of the sequence started by https://codereview.chromium.org/17472006/. This updates all chromium-side targets to depend on the final target names, the only stragglers are dependencies in blink which still depend on the forwarding _temp targets defined in webkit_resources.gyp. R=darin Review URL: https://chromiumcodereview.appspot.com/18209009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210635 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
-rw-r--r--content/content_shell.gypi8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index bfe11b8..1568617 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -52,7 +52,7 @@
'../url/url.gyp:url_lib',
'../v8/tools/gyp/v8.gyp:v8',
'../webkit/support/webkit_support.gyp:webkit_support',
- '../webkit/webkit_resources.gyp:webkit_temp_resources',
+ '../webkit/webkit_resources.gyp:webkit_resources',
],
'include_dirs': [
'..',
@@ -174,7 +174,7 @@
'<(SHARED_INTERMEDIATE_DIR)/webkit',
],
'dependencies': [
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
],
'configurations': {
'Debug_Base': {
@@ -294,8 +294,8 @@
'<(DEPTH)/net/net.gyp:net_resources',
'<(DEPTH)/ui/base/strings/ui_strings.gyp:ui_strings',
'<(DEPTH)/ui/ui.gyp:ui_resources',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_resources',
- '<(DEPTH)/webkit/webkit_resources.gyp:webkit_temp_strings',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources',
+ '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings',
],
'conditions': [
['OS!="android" and OS!="ios"', {