Add a wrapper for grit_action.gypi for chrome specific variables.

Add a wrapper for grit_action.gypi for chrome specific variables.

This makes it easier to add custom grit_additional_defines variable
values in addition to the chrome-default values.

Committed: https://crrev.com/b971058973dbb143b92de0d1c4104e6d8cb875cf
Cr-Commit-Position: refs/heads/master@{#367471}

[Lei Zhang, 2015-12-31 06:57:37]

thestig@chromium.org changed reviewers:
+ dbeam@chromium.org

[Lei Zhang, 2015-12-31 06:57:37]

It turns out in GYP, merging happens between files. After merging, references
are taken from the inner-most scope that defines the variable.

[Dan Beam, 2016-01-04 19:11:22]

lgtm w/observations

/cc brettw@ as FYI

https://codereview.chromium.org/1555803002/diff/1/chrome/chrome_resources.gyp
File chrome/chrome_resources.gyp (right):

https://codereview.chromium.org/1555803002/diff/1/chrome/chrome_resources.gyp...
chrome/chrome_resources.gyp:13: 'additional_modules_list_file':
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser/internal/additional_modules_list.txt',
I assume brettw@ did not add these with his chrome_features CL, but should these
be in chrome/chrome_grit_action.gypi?

https://codereview.chromium.org/1555803002/diff/1/chrome/chrome_resources.gyp...
chrome/chrome_resources.gyp:30: 'includes': [ 'chrome_grit_action.gypi' ],
i suppose chrome/grit_action.gypi is too easily confused with
build/grit_action.gypi?

[Lei Zhang, 2016-01-04 19:15:49]

https://codereview.chromium.org/1555803002/diff/1/chrome/chrome_resources.gyp
File chrome/chrome_resources.gyp (right):

https://codereview.chromium.org/1555803002/diff/1/chrome/chrome_resources.gyp...
chrome/chrome_resources.gyp:13: 'additional_modules_list_file':
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser/internal/additional_modules_list.txt',
On 2016/01/04 19:11:22, Dan Beam wrote:
> I assume brettw@ did not add these with his chrome_features CL, but should
these
> be in chrome/chrome_grit_action.gypi?

I didn't want chrome_internal_resources_gen to have to include
chrome_grit_action.gypi, since it's not a grit action.

https://codereview.chromium.org/1555803002/diff/1/chrome/chrome_resources.gyp...
chrome/chrome_resources.gyp:30: 'includes': [ 'chrome_grit_action.gypi' ],
On 2016/01/04 19:11:22, Dan Beam wrote:
> i suppose chrome/grit_action.gypi is too easily confused with
> build/grit_action.gypi?

It doesn't matter to me. I just wanted a unique identifier to make it easier to
search for.

[brettw, 2016-01-04 23:58:42]

On 2016/01/04 19:15:49, Lei Zhang wrote:
> https://codereview.chromium.org/1555803002/diff/1/chrome/chrome_resources.gyp
> File chrome/chrome_resources.gyp (right):
> 
>
https://codereview.chromium.org/1555803002/diff/1/chrome/chrome_resources.gyp...
> chrome/chrome_resources.gyp:13: 'additional_modules_list_file':
>
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser/internal/additional_modules_list.txt',
> On 2016/01/04 19:11:22, Dan Beam wrote:
> > I assume brettw@ did not add these with his chrome_features CL, but should
> these
> > be in chrome/chrome_grit_action.gypi?
> 
> I didn't want chrome_internal_resources_gen to have to include
> chrome_grit_action.gypi, since it's not a grit action.
> 
>
https://codereview.chromium.org/1555803002/diff/1/chrome/chrome_resources.gyp...
> chrome/chrome_resources.gyp:30: 'includes': [ 'chrome_grit_action.gypi' ],
> On 2016/01/04 19:11:22, Dan Beam wrote:
> > i suppose chrome/grit_action.gypi is too easily confused with
> > build/grit_action.gypi?
> 
> It doesn't matter to me. I just wanted a unique identifier to make it easier
to
> search for.

LGTM, this is the issue Dan raised on
https://codereview.chromium.org/1469383005/ right?

[Lei Zhang, 2016-01-05 00:01:00]

On 2016/01/04 23:58:42, brettw wrote:
> LGTM, this is the issue Dan raised on
> https://codereview.chromium.org/1469383005/ right?

Yes.

[Lei Zhang, 2016-01-05 00:01:34]

thestig@chromium.org changed reviewers:
+ brettw@chromium.org

[Lei Zhang, 2016-01-05 00:01:34]

+mark@ FYI

[Lei Zhang, 2016-01-05 03:00:41]

The CQ bit was checked by thestig@chromium.org

[Lei Zhang, 2016-01-05 03:00:41]

The patchset sent to the CQ was uploaded after l-g-t-m from brettw@chromium.org,
dbeam@chromium.org
Link to the patchset: https://codereview.chromium.org/1555803002/#ps20001
(title: "rebase")

[commit-bot: I haz the power, 2016-01-05 03:02:27]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1555803002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1555803002/20001

[commit-bot: I haz the power, 2016-01-05 03:26:33]

Committed patchset #2 (id:20001)

[commit-bot: I haz the power, 2016-01-05 03:27:19]

Description was changed from

==========
Add a wrapper for grit_action.gypi for chrome specific variables.

This makes it easier to add custom grit_additional_defines variable
values in addition to the chrome-default values.
==========

to

==========
Add a wrapper for grit_action.gypi for chrome specific variables.

This makes it easier to add custom grit_additional_defines variable
values in addition to the chrome-default values.

Committed: https://crrev.com/b971058973dbb143b92de0d1c4104e6d8cb875cf
Cr-Commit-Position: refs/heads/master@{#367471}
==========

[commit-bot: I haz the power, 2016-01-05 03:27:20]

Patchset 2 (id:??) landed as
https://crrev.com/b971058973dbb143b92de0d1c4104e6d8cb875cf
Cr-Commit-Position: refs/heads/master@{#367471}