diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 05:35:26 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 05:35:26 +0000 |
| commit | 66dd4f3c436b31eff90b9f1d304803dbfa38a4f1 (patch) | |
| tree | a5aac774a30ba104aa5798a01e5d4b1483461780 /chrome | |
| parent | fb8f1cac4288e0e4d26b093c6c62c28ebda744e1 (diff) | |
| download | chromium_src-66dd4f3c436b31eff90b9f1d304803dbfa38a4f1.zip chromium_src-66dd4f3c436b31eff90b9f1d304803dbfa38a4f1.tar.gz chromium_src-66dd4f3c436b31eff90b9f1d304803dbfa38a4f1.tar.bz2 | |
Repack webkit_resources_100_percent.pak into chrome_100_percent.pak.
BUG=144749
TEST=Chrome runs with webkit resources such as text resize icon working.
Review URL: https://chromiumcodereview.appspot.com/10991018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_repack_chrome.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_repack_chrome_100_percent.gypi | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi index f98baf0..df183c7 100644 --- a/chrome/chrome_repack_chrome.gypi +++ b/chrome/chrome_repack_chrome.gypi @@ -10,7 +10,6 @@ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', ], 'conditions': [ ['enable_extensions==1', { diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi index da717c9..b9bce36 100644 --- a/chrome/chrome_repack_chrome_100_percent.gypi +++ b/chrome/chrome_repack_chrome_100_percent.gypi @@ -8,6 +8,7 @@ '<(grit_out_dir)/renderer_resources_100_percent.pak', '<(grit_out_dir)/theme_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', ], 'conditions': [ ['use_aura==1', { |