Add support for GYP_GENERATOR_FLAGS out dir setting for landmines

build/landmines.py

Index: build/landmines.py
diff --git a/build/landmines.py b/build/landmines.py
index a03486499bba4b055881804d24915d2f8db80fd1..bdbba960746c7fc9c7244177f98d2e6f89d7f792 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']

[Sami, 2014/10/31 14:30:22]

nit: rewriting this so that both branches of the 'if' just set output_dir seems
like it would be slightly cleaner.

+      ret = os.path.join(SRC_DIR, output_dir)
+    else:
+      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)