Prevent landmines.py from deleting your source directory.

Previously, if CHROMIUM_OUT_DIR was set but blank, it could (and did!)
delete your entire source directory, including .git folder.

BUG=446921

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

Cr-Original-Commit-Position: refs/heads/master@{#311326}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 89d303ac3e23adf4ecff08e459a6bdf6b81ff033
This commit is contained in:
johnme 2015-01-13 13:28:41 -08:00 коммит произвёл Commit bot
Родитель 191b721614
Коммит 1d761e77e2
1 изменённых файлов: 5 добавлений и 4 удалений

Просмотреть файл

@ -44,11 +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.
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']
if 'CHROMIUM_OUT_DIR' in os.environ:
output_dir = os.environ.get('CHROMIUM_OUT_DIR').strip()
if not output_dir:
raise Error('CHROMIUM_OUT_DIR environment variable is set but blank!')
else:
output_dir = os.environ.get('CHROMIUM_OUT_DIR', 'out')
output_dir = landmine_utils.gyp_generator_flags().get('output_dir', 'out')
ret = os.path.join(SRC_DIR, output_dir)
else:
raise NotImplementedError('Unexpected GYP_GENERATORS (%s)' % build_tool)