diff options
| author | oetuaho <oetuaho@nvidia.com> | 2014-11-03 01:09:53 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-03 09:10:18 +0000 |
| commit | 6bad0d4fad0ee39e993d90eb2ab8050d650efa2b (patch) | |
| tree | 8dcf9e27d2efd6c2f56f42cabc4f2577f18662e5 /build/landmines.py | |
| parent | eb635da17345d5b82965da47ffd1d22b61a2b873 (diff) | |
| download | chromium_src-6bad0d4fad0ee39e993d90eb2ab8050d650efa2b.zip chromium_src-6bad0d4fad0ee39e993d90eb2ab8050d650efa2b.tar.gz chromium_src-6bad0d4fad0ee39e993d90eb2ab8050d650efa2b.tar.bz2 | |
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}
Diffstat (limited to 'build/landmines.py')
| -rwxr-xr-x | build/landmines.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/landmines.py b/build/landmines.py index a034864..e1ce6f3 100755 --- a/build/landmines.py +++ b/build/landmines.py @@ -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) |