From fc0ba612a3a1b11236b2c0a02922d557a554d2a9 Mon Sep 17 00:00:00 2001
From: "bradnelson@google.com"
 <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 10 Feb 2010 19:25:12 +0000
Subject: Cleaning up invocations of grit and grit_info. Making webkit grd
 dependencies more correct.

BUG=19866
TEST=None

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38646 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/chrome.gyp | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'chrome/chrome.gyp')

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 963bfbb..b0a1a76 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -54,10 +54,11 @@
       'common/common_resources.grd',
       'renderer/renderer_resources.grd',
     ],
-    'grit_info_cmd': ['python', '../tools/grit/grit_info.py',],
-    'repack_locales_cmd': ['python', 'tools/build/repack_locales.py',],
+    'grit_info_cmd': ['python', '../tools/grit/grit_info.py'],
+    'grit_cmd': ['python', '../tools/grit/grit.py'],
+    'repack_locales_cmd': ['python', 'tools/build/repack_locales.py'],
     # TODO: remove this helper when we have loops in GYP
-    'apply_locales_cmd': ['python', 'tools/build/apply_locales.py',],
+    'apply_locales_cmd': ['python', 'tools/build/apply_locales.py'],
     'conditions': [
       ['OS=="win"', {
         'nacl_defines': [
@@ -174,7 +175,7 @@
             # One alternative would be to turn this into several actions,
             # but that would be rather verbose.
           ],
-          'action': ['python', '../tools/grit/grit.py', '-i',
+          'action': ['<@(grit_cmd)', '-i',
             '<(RULE_INPUT_PATH)',
             'build', '-o', '<(grit_out_dir)',
             '-D', '<(chrome_build)',
@@ -260,7 +261,7 @@
             #'<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(chrome_strings_grds))',
             # See comment in chrome_resources as to why.
           ],
-          'action': ['python', '../tools/grit/grit.py', '-i',
+          'action': ['<@(grit_cmd)', '-i',
                     '<(RULE_INPUT_PATH)',
                     'build', '-o', '<(grit_out_dir)',
                     '-D', '<(chrome_build)'],
@@ -290,9 +291,6 @@
       'target_name': 'theme_resources',
       'type': 'none',
       'msvs_guid' : 'A158FB0A-25E4-6523-6B5A-4BB294B73D31',
-      'variables': {
-        'grit_path': '../tools/grit/grit.py',
-      },
       'actions': [
         {
           'action_name': 'theme_resources',
@@ -316,7 +314,7 @@
             '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
           ],
           'action': [
-            'python', '<(grit_path)',
+            '<@(grit_cmd)',
             '-i', '<(input_path)', 'build',
             '-o', '<(grit_out_dir)',
             '-D', '<(chrome_build)'
@@ -348,9 +346,6 @@
       # can't use chrome_strings rules above.
       'target_name': 'platform_locale_settings',
       'type': 'none',
-      'variables': {
-        'grit_path': '../tools/grit/grit.py',
-      },
       'actions': [
         {
           'action_name': 'platform_locale_settings',
@@ -374,7 +369,7 @@
             '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
           ],
           'action': [
-            'python', '<(grit_path)',
+            '<@(grit_cmd)',
             '-i', '<(input_path)', 'build',
             '-o', '<(grit_out_dir)',
             '-D', '<(chrome_build)'
-- 
cgit v1.1