Commit 6bad0d4f authored by oetuaho's avatar oetuaho Committed by Commit bot

Add support for GYP_GENERATOR_FLAGS out dir setting for landmines

BUG=421894

Review URL: https://codereview.chromium.org/695753002

Cr-Commit-Position: refs/heads/master@{#302419}
parent eb635da1
......@@ -47,6 +47,12 @@ def gyp_defines():
return dict(arg.split('=', 1)
for arg in shlex.split(os.environ.get('GYP_DEFINES', '')))
@memoize()
def gyp_generator_flags():
"""Parses and returns GYP_GENERATOR_FLAGS env var as a dictionary."""
return dict(arg.split('=', 1)
for arg in shlex.split(os.environ.get('GYP_GENERATOR_FLAGS', '')))
@memoize()
def gyp_msvs_version():
return os.environ.get('GYP_MSVS_VERSION', '')
......
......@@ -44,7 +44,12 @@ def get_build_dir(build_tool, is_iphone=False):
if build_tool == 'xcode':
ret = os.path.join(SRC_DIR, 'xcodebuild')
elif build_tool in ['make', 'ninja', 'ninja-ios']: # TODO: Remove ninja-ios.
ret = os.path.join(SRC_DIR, os.environ.get('CHROMIUM_OUT_DIR', 'out'))
if ('CHROMIUM_OUT_DIR' not in os.environ and
'output_dir' in landmine_utils.gyp_generator_flags()):
output_dir = landmine_utils.gyp_generator_flags()['output_dir']
else:
output_dir = os.environ.get('CHROMIUM_OUT_DIR', 'out')
ret = os.path.join(SRC_DIR, output_dir)
else:
raise NotImplementedError('Unexpected GYP_GENERATORS (%s)' % build_tool)
return os.path.abspath(ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment