build/landmines.py - Issue 697123002: Revert of Add support for GYP_GENERATOR_FLAGS out dir setting for landmines

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/landmines.py

Issue 697123002: Revert of Add support for GYP_GENERATOR_FLAGS out dir setting for landmines (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/landmines.py

diff --git a/build/landmines.py b/build/landmines.py

index e1ce6f35d4ae45cc9907305d02cfc1e803a7ad12..a03486499bba4b055881804d24915d2f8db80fd1 100755

--- a/build/landmines.py

+++ b/build/landmines.py

@@ -44,12 +44,7 @@

if build_tool == 'xcode':

ret = os.path.join(SRC_DIR, 'xcodebuild')

elif build_tool in ['make', 'ninja', 'ninja-ios']: # TODO: Remove ninja-ios.

- 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)

+ ret = os.path.join(SRC_DIR, os.environ.get('CHROMIUM_OUT_DIR', 'out'))

else:

raise NotImplementedError('Unexpected GYP_GENERATORS (%s)' % build_tool)

return os.path.abspath(ret)

« no previous file with comments | « build/landmine_utils.py ('k') | no next file » | no next file with comments »