chrome/chrome_dll.gypi - Issue 10825234: Revert 150411 - Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/chrome_dll.gypi

Issue 10825234: Revert 150411 - 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

Index: chrome/chrome_dll.gypi

===================================================================

--- chrome/chrome_dll.gypi (revision 150448)

+++ chrome/chrome_dll.gypi (working copy)

@@ -289,8 +289,9 @@

'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

@@ -531,7 +532,9 @@

}],

['enable_hidpi==1', {

'mac_bundle_resources': [

- '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_200_percent.pak',

+ '<(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',

}],

], # 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 »