commit 558790d6acca3451cf3a6b497803a5f07d0bec58
author Ben Murdoch <benm@google.com> Tue Jul 30 15:19:42 2013 +0100
committer Ben Murdoch <benm@google.com> Tue Jul 30 15:19:42 2013 +0100
tree fcc36c3da74559ee6015cb5e9f596105cdc9f56e
parent 8643c35ec8e6546ae6e04c51e08c4d57d40e88da

Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1

chrome/chrome_repack_chrome.gypi

diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi
index 33bdd8a..80683c5 100644
--- a/chrome/chrome_repack_chrome.gypi
+++ b/chrome/chrome_repack_chrome.gypi
@@ -15,6 +15,7 @@
         'pak_inputs': [
           '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
           '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.pak',
+          '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak',
           '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
         ],
       }],