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

1 files changed, 17 insertions, 6 deletions

diff --git a/webkit/webkit_resources.gyp b/webkit/webkit_resources.gyp
index c6f1eff..e386cef 100644
--- a/webkit/webkit_resources.gyp
+++ b/webkit/webkit_resources.gyp
@@ -4,17 +4,15 @@
 
 {
   'targets': [
-# TODO(jamesr): These targets should be called webkit_(resources|strings), but can't
-# until blink is updated.
     {
-      'target_name': 'webkit_temp_resources',
+      'target_name': 'webkit_resources',
       'type': 'none',
       'variables': {
         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
       },
       'actions': [
         {
-          'action_name': 'webkit_temp_resources',
+          'action_name': 'webkit_resources',
           'variables': {
             'grit_grd_file': 'glue/resources/webkit_resources.grd',
           },
@@ -34,14 +32,14 @@
       },
     },
     {
-      'target_name': 'webkit_temp_strings',
+      'target_name': 'webkit_strings',
       'type': 'none',
       'variables': {
         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
       },
       'actions': [
         {
-          'action_name': 'webkit_temp_strings',
+          'action_name': 'webkit_strings',
           'variables': {
             'grit_grd_file': 'glue/webkit_strings.grd',
           },
@@ -50,6 +48,19 @@
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
+# TODO(jamesr): Remove these once blink depends on the real targets.
+    {
+      'target_name': 'webkit_temp_resources',
+      'type': 'none',
+      'dependencies': [ 'webkit_resources' ],
+      'export_dependent_settings': [ 'webkit_resources' ],
+    },
+    {
+      'target_name': 'webkit_temp_strings',
+      'type': 'none',
+      'dependencies': [ 'webkit_strings' ],
+      'export_dependent_settings': [ 'webkit_strings' ],
+    },
   ]
 }