Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
new file mode 100644
index 0000000..d594d0e
--- /dev/null
+++ b/chrome/chrome_repack_chrome.gypi
@@ -0,0 +1,39 @@
+# Copyright (c) 2012 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.
+{
+  'action_name': 'repack_chrome',
+  'variables': {
+    'pak_inputs': [
+      '<(grit_out_dir)/browser_resources.pak',
+      '<(grit_out_dir)/common_resources.pak',
+      '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
+    ],
+    'conditions': [
+      ['OS != "ios"', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
+        ],
+      }],
+      ['enable_extensions==1', {
+        'pak_inputs': [
+          '<(grit_out_dir)/extensions_api_resources.pak',
+        ],
+      }],
+      ['use_ash==1', {
+        'pak_inputs': [
+          '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.pak',
+        ],
+      }],
+    ],
+  },
+  'inputs': [
+    '<(repack_path)',
+    '<@(pak_inputs)',
+  ],
+  'outputs': [
+    '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
+  ],
+  'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
+}