chrome/chrome_repack_resources.gypi - Issue 11189031: Add iOS support to the chrome/ resource gyp/gypi 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_repack_resources.gypi

Issue 11189031: Add iOS support to the chrome/ resource gyp/gypi files (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 2 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_repack_resources.gypi

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

index 792a1b18d0ea01fb7341d2e24ad7d219a7ff0ccf..a785af6a544d7f0ca2deff8b601343d82947bdab 100644

--- a/chrome/chrome_repack_resources.gypi

+++ b/chrome/chrome_repack_resources.gypi

@@ -5,17 +5,21 @@

'action_name': 'repack_resources',

'variables': {

'pak_inputs': [

- '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',

- '<(grit_out_dir)/component_extension_resources.pak',

- '<(grit_out_dir)/devtools_discovery_page_resources.pak',

- '<(grit_out_dir)/net_internals_resources.pak',

- '<(grit_out_dir)/options_resources.pak',

- '<(grit_out_dir)/quota_internals_resources.pak',

'<(grit_out_dir)/shared_resources.pak',

'<(grit_out_dir)/sync_internals_resources.pak',

'conditions': [

- ['OS != "mac"', {

+ ['OS != "ios"', {

+ 'pak_inputs': [

+ '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',

+ '<(grit_out_dir)/component_extension_resources.pak',

+ '<(grit_out_dir)/devtools_discovery_page_resources.pak',

+ '<(grit_out_dir)/net_internals_resources.pak',

+ '<(grit_out_dir)/options_resources.pak',

+ '<(grit_out_dir)/quota_internals_resources.pak',

+ ],

+ }],

+ ['OS != "mac" and OS != "ios"', {

'pak_inputs': [

'<(grit_out_dir)/quota_internals_resources.pak',