Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Unified Diff: chrome/chrome_dll.gypi

Issue 10825111: Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/test_package.py ('k') | chrome/chrome_repack_chrome_100_percent.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_dll.gypi
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 5156e57850ee3e7743249d4124745e7bcc3a34a9..90e0b86f1ba7b8435308e170df6b8bd60d527b04 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
« no previous file with comments | « build/android/pylib/test_package.py ('k') | chrome/chrome_repack_chrome_100_percent.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698