Clean up repack.py and repack_locale.py usage.

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 1a132fdb99e861dbed1e6ead22a7d9ff2e684cdf..b1dbd934d67078a4f8907229594ad1d3fcab4f09 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -473,9 +473,6 @@
           ],
         }],
       ],
-      'variables': {
-        'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
-      },
       'actions': [
         {
           'action_name': 'repack_content_shell_pack',
@@ -493,29 +490,20 @@
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.pak',
             ],
+            'conditions': [
+              ['OS!="android"', {
+                'variables': {
+                  'pak_inputs': [
+                    '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
+                  ],
+                },
+                'pak_output': '<(PRODUCT_DIR)/content_shell.pak',

[tfarina, 2014/04/02 19:11:38]

this isn't inside 'variables', does that make any difference? I notice that
pak_inputs is, but pak_output isn't. hence it might not being generating a
pak_output variable.

[blundell, 2014/04/03 08:43:43]

The conditions block is actually within a 'variables' dictionary -- in fact, the
inner 'variables' dictionary at 495 is probably unnecessary.

On 2014/04/02 19:11:38, tfarina wrote:

+              }, {
+                'pak_output': '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
+              }],
+            ],
           },
-          'inputs': [
-            '<(repack_path)',
-            '<@(pak_inputs)',
-          ],
-          'action': ['python', '<(repack_path)', '<@(_outputs)',
-                     '<@(pak_inputs)'],
-          'conditions': [
-            ['OS!="android"', {
-              'variables': {
-                'pak_inputs': [
-                  '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
-                ],
-              },
-              'outputs': [
-                '<(PRODUCT_DIR)/content_shell.pak',
-              ],
-            }, {
-              'outputs': [
-                '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
-              ],
-            }],
-          ],
+          'includes': [ '../build/repack_action.gypi' ],
         },
       ],
     },