build/grit_action.gypi - Issue 1124763003: Update from https://crrev.com/327068

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: build/grit_action.gypi

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 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: build/grit_action.gypi

diff --git a/build/grit_action.gypi b/build/grit_action.gypi

index 462fb4ca7eb3c1031e23db9a9a44ebc98e8648cf..b24f0f8d715cd0333db9b9cb9e16a7635657878a 100644

--- a/build/grit_action.gypi

+++ b/build/grit_action.gypi

@@ -50,11 +50,12 @@

'inputs': [

'<!@pymod_do_main(grit_info <@(grit_defines) <@(grit_additional_defines) '

- '--inputs <(grit_grd_file) -f "<(grit_resource_ids)")',

+ '<@(grit_whitelist_flag) --inputs <(grit_grd_file) '

+ '-f "<(grit_resource_ids)")',

'outputs': [

'<!@pymod_do_main(grit_info <@(grit_defines) <@(grit_additional_defines) '

- '--outputs \'<(grit_out_dir)\' '

+ '<@(grit_whitelist_flag) --outputs \'<(grit_out_dir)\' '

'<(grit_grd_file) -f "<(grit_resource_ids)")',

'action': ['<@(grit_cmd)',