summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_dll.gypi
diff options
context:
space:
mode:
authorflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 21:17:38 +0000
committerflackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 21:17:38 +0000
commitb3ff3b057cf8e0bcea5f5a9b838dcc2aa7378f1a (patch)
treefc7fa19d684e901db6f6349f540c2fc74c194d9c /chrome/chrome_dll.gypi
parent0da3574c9c72088abfd57be3c5cdad5c57a2a435 (diff)
downloadchromium_src-b3ff3b057cf8e0bcea5f5a9b838dcc2aa7378f1a.zip
chromium_src-b3ff3b057cf8e0bcea5f5a9b838dcc2aa7378f1a.tar.gz
chromium_src-b3ff3b057cf8e0bcea5f5a9b838dcc2aa7378f1a.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
-rw-r--r--chrome/chrome_dll.gypi7
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