Clean up repack.py and repack_locale.py usage.

apps/apps.gypi

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'apps',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 99 matching lines @@
             'chrome_resources.gyp:chrome_resources',
             # Need app related resources in theme_resources_100_percent.pak
             'chrome_resources.gyp:theme_resources',
             # Need dev-tools related resources in shell_resources.pak and
             # devtools_resources.pak.
             '../content/content_shell_and_tests.gyp:generate_content_shell_resources',
             '../content/browser/devtools/devtools_resources.gyp:devtools_resources',
             '../ui/base/strings/ui_strings.gyp:ui_strings',
             '../ui/resources/ui_resources.gyp:ui_resources',
           ],
-          'variables': {
-            'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
-          },
           'actions': [
             {
               'action_name': 'repack_app_shell_pack',
               'variables': {
                 'pak_inputs': [
                   '<(grit_out_dir)/common_resources.pak',
                   '<(grit_out_dir)/extensions_api_resources.pak',
                   # TODO(jamescook): extra the extension/app related resources
                   # from generated_resources_en-US.pak and
                   # theme_resources_100_percent.pak.
                   '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_settings_en-US.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
                   '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
                 ],
+                'pak_output': '<(PRODUCT_DIR)/app_shell.pak',
               },
-              'inputs': [
-                '<(repack_path)',
-                '<@(pak_inputs)',
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/app_shell.pak',
-              ],
-              'action': ['python', '<(repack_path)', '<@(_outputs)',
-                         '<@(pak_inputs)'],
+             'includes': [ '../build/repack_action.gypi' ],
             },
           ],
         },
         {
           'target_name': 'app_shell_lib',
           'type': 'static_library',
           'defines!': ['CONTENT_IMPLEMENTATION'],
           'variables': {
             'chromium_code': 1,
           },
@@ skipping 102 matching lines @@
             'test/app_shell_test.cc',
             'test/apps_test_launcher_delegate.cc',
             'test/apps_test_launcher_delegate.h',
             'test/apps_tests_main.cc',
           ],
         },
       ],  # targets
     }],  # chromeos==1 or linux aura or win aura
   ],  # conditions
 }