content: Cleanup content_resources.gyp

Simplifies content_resources into a single target, making it easier to read
and/or copy in other places. This is similar to what is done in
ui/keyboard/keyboard.gyp.

TEST=ninja -C out/Debug content_resources still works as intended.
R=joi@chromium.org
TBR=darin@chromium.org

Review URL: https://chromiumcodereview.appspot.com/18937004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211674 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 19 deletions

diff --git a/content/content_resources.gyp b/content/content_resources.gyp
index db2ce8b..65fdb9a 100644
--- a/content/content_resources.gyp
+++ b/content/content_resources.gyp
@@ -6,16 +6,23 @@
 # content.gyp doesn't depend on gyp files from chrome/ anymore:
 # http://crbug.com/10394
 {
-  'variables': {
-    'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
-  },
   'targets': [
     {
       'target_name': 'content_resources',
       'type': 'none',
-      'dependencies': [
-        'generate_content_resources',
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/content',
+      },
+      'actions': [
+        {
+          'action_name': 'generate_content_resources',
+          'variables': {
+            'grit_grd_file': 'content_resources.grd',
+          },
+          'includes': [ '../build/grit_action.gypi' ],
+        },
       ],
+      'includes': [ '../build/grit_target.gypi' ],
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)',
@@ -24,20 +31,6 @@
           ],
         },
       ],
-      'includes': [ '../build/grit_target.gypi' ],
-    },
-    {
-      'target_name': 'generate_content_resources',
-      'type': 'none',
-      'actions': [
-        {
-          'action_name': 'content_resources',
-          'variables': {
-            'grit_grd_file': 'content_resources.grd',
-          },
-          'includes': [ '../build/grit_action.gypi' ],
-        },
-      ],
     },
   ],
 }