Export generator flavor to gyp scripts

Export generator flavor to gyp scripts

When using flavored generator ("xcode-ninja" or "msvs-ninja") then the
GENERATOR variable only reflect the value of the project generator but
not the build flavor.

If gyp files do conditional on the generator using that variable, then
they may do less than ideal choices due to partial knowledge of the
build setup (see Chromium iOS build system that recursively invoke gyp
when targetting Xcode due to cross-compilation).

BUG=467575
R=justincohen@chromium.org, mark@chromium.org

Committed: https://chromium.googlesource.com/external/gyp/+/d174d75bf69c682cb62af9187879e01513b35e52

[sdefresne, 2015-03-16 15:04:07]

sdefresne@chromium.org changed reviewers:
+ justincohen@chromium.org

[sdefresne, 2015-03-16 15:04:07]

Can you take a look?

What I'm trying to do is allow Chromium gyp file to detect that
GYP_GENERATOR=xcode-ninja so that tests deciding whether to use
build/ios/mac_build.gypi can make the correct decision when using that generator
(currently impossible since GENERATOR=xcode).

[justincohen, 2015-03-16 15:12:24]

LGTM with question.

https://codereview.chromium.org/1004803005/diff/1/pylib/gyp/__init__.py
File pylib/gyp/__init__.py (right):

https://codereview.chromium.org/1004803005/diff/1/pylib/gyp/__init__.py#newco...
pylib/gyp/__init__.py:65: flavor = params['flavor']
is it necessary to pull this out into a new variable?  why not just:

default_variables['GENERATOR_FLAVOR'] = params['flavor'] or ""

[sdefresne, 2015-03-16 15:47:05]

https://codereview.chromium.org/1004803005/diff/1/pylib/gyp/__init__.py
File pylib/gyp/__init__.py (right):

https://codereview.chromium.org/1004803005/diff/1/pylib/gyp/__init__.py#newco...
pylib/gyp/__init__.py:65: flavor = params['flavor']
On 2015/03/16 15:12:24, justincohen wrote:
> is it necessary to pull this out into a new variable?  why not just:
> 
> default_variables['GENERATOR_FLAVOR'] = params['flavor'] or ""

The variable already existed (see above) but was never set (which took me some
time to find). And since a dictionary will raise an exception if accessing a
non-existent key, I preferred re-using the variable.

[sdefresne, 2015-03-16 15:49:00]

https://codereview.chromium.org/1004803005/diff/1/pylib/gyp/__init__.py
File pylib/gyp/__init__.py (right):

https://codereview.chromium.org/1004803005/diff/1/pylib/gyp/__init__.py#newco...
pylib/gyp/__init__.py:65: flavor = params['flavor']
On 2015/03/16 15:47:05, sdefresne wrote:
> On 2015/03/16 15:12:24, justincohen wrote:
> > is it necessary to pull this out into a new variable?  why not just:
> > 
> > default_variables['GENERATOR_FLAVOR'] = params['flavor'] or ""
> 
> The variable already existed (see above) but was never set (which took me some
> time to find). And since a dictionary will raise an exception if accessing a
> non-existent key, I preferred re-using the variable.

Done.

[sdefresne, 2015-03-16 15:57:04]

sdefresne@chromium.org changed reviewers:
+ mark@chromium.org

[sdefresne, 2015-03-16 15:57:04]

mark: could you review?

[Mark Mentovai, 2015-03-16 16:06:37]

LGTM

[sdefresne, 2015-03-16 16:38:34]

Committed patchset #2 (id:20001) manually as
d174d75bf69c682cb62af9187879e01513b35e52 (presubmit successful).