diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 16:43:06 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-08 16:43:06 +0000 |
| commit | 708bfade92371f332193719397c26f8568363cdb (patch) | |
| tree | 55ab3c70bdb401e3268a3953c9a9946d84c7a1f3 /chrome/chrome_dll.gypi | |
| parent | 123d80775a39200f05bd6baf5ac779bee18030e6 (diff) | |
| download | chromium_src-708bfade92371f332193719397c26f8568363cdb.zip chromium_src-708bfade92371f332193719397c26f8568363cdb.tar.gz chromium_src-708bfade92371f332193719397c26f8568363cdb.tar.bz2 | |
Reland 150411 - "Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files."
BUG=139803
TEST=Chrome runs with ui and theme resources correctly loaded.
Review URL: https://chromiumcodereview.appspot.com/10825111
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10827225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 5156e57..90e0b86 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -289,9 +289,8 @@ 'app/theme/otr_icon.pdf', 'browser/mac/install.sh', '<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak', + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak', - '<(grit_out_dir)/theme_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', '<!@pymod_do_main(repack_locales -o -p <(OS) -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))', # Note: pseudo_locales are generated via the packed_resources # dependency but not copied to the final target. See @@ -532,9 +531,7 @@ }], ['enable_hidpi==1', { 'mac_bundle_resources': [ - '<(grit_out_dir)/theme_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_200_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak', ], }], ], # conditions |