chrome/chrome_dll_bundle.gypi - Issue 2004143002: Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5

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_bundle.gypi

Issue 2004143002: Retry of 2b0e51237fa07b4fb9f6c20edcefce094f6cf5f5 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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:

Index: chrome/chrome_dll_bundle.gypi

diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi

index eadbffde95250442f1e6db96709c00341debc1bd..bbcc1d2a36007abf0bcb3b2ffe1af5ebd23814ba 100644

--- a/chrome/chrome_dll_bundle.gypi

+++ b/chrome/chrome_dll_bundle.gypi

@@ -59,6 +59,7 @@

'<@(mac_all_xibs)',

'browser/mac/install.sh',

'<(SHARED_INTERMEDIATE_DIR)/repack/chrome_100_percent.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_100_percent.pak',

'<(SHARED_INTERMEDIATE_DIR)/repack/resources.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

@@ -243,15 +244,6 @@

['enable_hidpi==1', {

'mac_bundle_resources': [

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

- ],

- }],

- ['enable_topchrome_md==1', {

- 'mac_bundle_resources': [

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

- ],

- }],

- ['enable_topchrome_md==1 and enable_hidpi==1', {

- 'mac_bundle_resources': [

'<(SHARED_INTERMEDIATE_DIR)/repack/chrome_material_200_percent.pak',

}],

« no previous file with comments | « chrome/browser_tests.isolate ('k') | chrome/chrome_repack_chrome_material_100_percent.gypi » ('j') | no next file with comments »