Android's stack script: Make --output-dir / CHROMIUM_OUTPUT_DIR mandatory

build/android/pylib/constants/__init__.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Defines a set of constants shared by test runners and other scripts."""
 
 # TODO(jbudorick): Split these constants into coherent modules.
 
 # pylint: disable=W0212
 
@@ skipping 226 matching lines @@
   """
   if 'CHROMIUM_OUTPUT_DIR' in os.environ:
     return os.path.abspath(os.path.join(
         DIR_SOURCE_ROOT, os.environ.get('CHROMIUM_OUTPUT_DIR')))
 
   return os.path.abspath(os.path.join(
       DIR_SOURCE_ROOT, os.environ.get('CHROMIUM_OUT_DIR', 'out'),
       GetBuildType() if build_type is None else build_type))
 
 
+def CheckOutputDirectory():
+  """Checks that CHROMIUM_OUT_DIR or CHROMIUM_OUTPUT_DIR is set.
+
+  If neither are set, but the current working directory is a build directory,
+  then CHROMIUM_OUTPUT_DIR is set to the current working directory.
+
+  Raises:
+    Exception: If no output directory is detected.
+  """
+  output_dir = os.environ.get('CHROMIUM_OUTPUT_DIR')
+  out_dir = os.environ.get('CHROMIUM_OUT_DIR')
+  if not output_dir and not out_dir:
+    # If CWD is an output directory, then assume it's the desired one.
+    if os.path.exists('build.ninja'):
+      output_dir = os.getcwd()
+      SetOutputDirectory(output_dir)
+    else:
+      raise Exception('Neither CHROMIUM_OUTPUT_DIR nor CHROMIUM_OUT_DIR '
+                      'has been set')
+
+
 # TODO(jbudorick): Convert existing callers to AdbWrapper.GetAdbPath() and
 # remove this.
 def GetAdbPath():
   from devil.android.sdk import adb_wrapper
   return adb_wrapper.AdbWrapper.GetAdbPath()
 
 
 # Exit codes
 ERROR_EXIT_CODE = exit_codes.ERROR
 INFRA_EXIT_CODE = exit_codes.INFRA
 WARNING_EXIT_CODE = exit_codes.WARNING