Add --output-dir flag to third_party/android_platform/development/scripts/stack

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 189 matching lines @@
     ]
   },
 }
 
 LOCAL_MACHINE_TESTS = ['junit', 'python']
 VALID_ENVIRONMENTS = ['local', 'remote_device']
 VALID_TEST_TYPES = ['gtest', 'instrumentation', 'junit', 'linker', 'monkey',
                     'perf', 'python', 'uirobot']
 VALID_DEVICE_TYPES = ['Android', 'iOS']
 
+# Whether CHROMIUM_OUT_DIR or CHROMIUM_OUTPUT_DIR must be set when calling
+# GetOutDirectory(). Scripts that are called directly by devs are encouraged to
+# enable this in order to eliminate confusion by having the wrong output
+# directory used (http://crbug.com/573345)
+require_explicit_output_dir = False
+
 
 def GetBuildType():
   try:
     return os.environ['BUILDTYPE']
   except KeyError:
     raise EnvironmentError(
         'The BUILDTYPE environment variable has not been set')
 
 
 def SetBuildType(build_type):
   os.environ['BUILDTYPE'] = build_type
 
 
 def SetBuildDirectory(build_directory):
   os.environ['CHROMIUM_OUT_DIR'] = build_directory
 
 
 def SetOutputDirectory(output_directory):
   os.environ['CHROMIUM_OUTPUT_DIR'] = output_directory
 
 
 def GetOutDirectory(build_type=None):

[jbudorick, 2016/02/03 14:22:27]

I don't think this is the right place to do this validation. I'd strongly prefer
doing it in a separate function that scripts call directly at argument parsing
time.

[agrieve, 2016/02/03 20:27:17]

Done (and I think it looks much nicer now!)

   """Returns the out directory where the output binaries are built.
 
   Args:
     build_type: Build type, generally 'Debug' or 'Release'. Defaults to the
       globally set build type environment variable BUILDTYPE.
   """
-  if 'CHROMIUM_OUTPUT_DIR' in os.environ:
+  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)
+
+  if output_dir:
     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'),
+  if not out_dir:
+    if require_explicit_output_dir:
+      raise EnvironmentError('Neither CHROMIUM_OUTPUT_DIR nor CHROMIUM_OUT_DIR '
+                             'has been set')
+    out_dir = 'out'
+
+  return os.path.abspath(os.path.join(DIR_SOURCE_ROOT, out_dir,
       GetBuildType() if build_type is None else build_type))
 
 
 # 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