diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2011-12-21 12:39:36 -0800 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2011-12-21 12:39:36 -0800 |
| commit | 60a9e1e40fd520a224b4a971a464227e6838e7af (patch) | |
| tree | ba39e4f3af1303045a00c77c9b3ac8a491dbf047 /tools/gyp/pylib/gyp/generator/dump_dependency_json.py | |
| parent | f7f8af842077be4e6cc580ddedcccea71e073bbb (diff) | |
| download | android-node-v8-60a9e1e40fd520a224b4a971a464227e6838e7af.tar.gz android-node-v8-60a9e1e40fd520a224b4a971a464227e6838e7af.tar.bz2 android-node-v8-60a9e1e40fd520a224b4a971a464227e6838e7af.zip | |
Upgrade GYP to r1115
Diffstat (limited to 'tools/gyp/pylib/gyp/generator/dump_dependency_json.py')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/dump_dependency_json.py | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/tools/gyp/pylib/gyp/generator/dump_dependency_json.py b/tools/gyp/pylib/gyp/generator/dump_dependency_json.py index ada1d35b07..1e0900a231 100644 --- a/tools/gyp/pylib/gyp/generator/dump_dependency_json.py +++ b/tools/gyp/pylib/gyp/generator/dump_dependency_json.py @@ -25,21 +25,10 @@ for unused in ['RULE_INPUT_PATH', 'RULE_INPUT_ROOT', 'RULE_INPUT_NAME', generator_default_variables[unused] = '' -def GetFlavor(params): - """Returns |params.flavor| if it's set, the system's default flavor else.""" - flavors = { - 'darwin': 'mac', - 'sunos5': 'solaris', - 'freebsd7': 'freebsd', - 'freebsd8': 'freebsd', - } - flavor = flavors.get(sys.platform, 'linux') - return params.get('flavor', flavor) - - def CalculateVariables(default_variables, params): generator_flags = params.get('generator_flags', {}) - default_variables['OS'] = generator_flags.get('os', GetFlavor(params)) + default_variables['OS'] = generator_flags.get( + 'os', gyp.common.GetFlavor(params)) def CalculateGeneratorInputInfo(params): |