Add new app_resources target, and remove all dependencies on chrome.gyp from app.gyp.

http://crbug.com/11387

Review URL: http://codereview.chromium.org/113588

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

1 files changed, 39 insertions, 9 deletions

diff --git a/app/app.gyp b/app/app.gyp
index 71efee1..7767416 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -42,6 +42,7 @@
       'type': '<(library)',
       'msvs_guid': '4631946D-7D5F-44BD-A5A8-504C0A7033BE',
       'dependencies': [
+        'app_resources',
         'app_strings',
         '../base/base.gyp:base',
         '../base/base.gyp:base_gfx',
@@ -141,12 +142,6 @@
             'gfx/icon_util.h',
             'os_exchange_data.cc',
           ],
-          # TODO: Move these dependencies to platform-neutral once these
-          # projects are generated by GYP.
-          'dependencies': [
-            '../chrome/chrome.gyp:chrome_resources',
-            '../chrome/chrome.gyp:chrome_strings',
-          ],
           'conditions': [
             ['toolkit_views==0', {
               # Note: because of gyp predence rules this has to be defined as
@@ -166,6 +161,7 @@
       'msvs_guid': 'B4D59AE8-8D2F-97E1-A8E9-6D2826729530',
       'dependencies': [
         'app_base',
+        'app_resources',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
@@ -194,9 +190,6 @@
           # projects are generated by GYP.
           'dependencies': [
             '../build/linux/system.gyp:gtk',
-            '../chrome/chrome.gyp:chrome_resources',
-            '../chrome/chrome.gyp:chrome_strings',
-            '../chrome/chrome.gyp:test_support_unit',
           ],
         }],
         ['OS!="win"', {
@@ -245,5 +238,42 @@
         }],
       ],
     },
+    {
+      'target_name': 'app_resources',
+      'type': 'none',
+      'msvs_guid': '3FBC4235-3FBD-46DF-AEDC-BADBBA13A095',
+      'variables': {
+        'grit_path': '../tools/grit/grit.py',
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app',
+      },
+      'actions': [
+        {
+          'action_name': 'app_resources',
+          'variables': {
+            'input_path': 'resources/app_resources.grd',
+          },
+          'inputs': [
+            '<(input_path)',
+          ],
+          'outputs': [
+            '<(grit_out_dir)/grit/app_resources.h',
+            '<(grit_out_dir)/app_resources.pak',
+            '<(grit_out_dir)/app_resources.rc',
+          ],
+          'action': ['python', '<(grit_path)', '-i', '<(input_path)', 'build', '-o', '<(grit_out_dir)'],
+          'message': 'Generating resources from <(input_path)',
+        },
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/app',
+        ],
+      },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['../build/win/system.gyp:cygwin'],
+        }],
+      ],
+    },    
   ],
 }