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

build/android/pylib/constants/__init__.py

Index: build/android/pylib/constants/__init__.py
diff --git a/build/android/pylib/constants/__init__.py b/build/android/pylib/constants/__init__.py
index 1a48723d584e308175ccf2a05cf504246d9b89b7..316b383e735b52d34db683e8bb19ad67178305c4 100644
--- a/build/android/pylib/constants/__init__.py
+++ b/build/android/pylib/constants/__init__.py
@@ -244,6 +244,27 @@ def GetOutDirectory(build_type=None):
       GetBuildType() if build_type is None else build_type))
 
 
+def CheckOutDirectory():

[pasko, 2016/02/04 12:53:40]

nit: s/Out/Output/ because it is done after SetOutputDirectory()

[agrieve, 2016/02/04 18:30:50]

Done.

+  """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:
+    EnvironmentError: 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 EnvironmentError('Neither CHROMIUM_OUTPUT_DIR nor CHROMIUM_OUT_DIR '

[pasko, 2016/02/04 12:53:40]

EnvironmentError is something that keeps a filename and an errno, raising it in
this case is causing questions like "how will these be used? would errno be the
right one? is it used to be caught where we expect IOError amd OSError?". If
this class is not essential, please just 'raise Esxception(...)'. If it is
essential, I'd like to know why.

[jbudorick, 2016/02/04 16:13:45]

Agreed.

[agrieve, 2016/02/04 18:30:50]

Done.

+                             'has been set')
+
+
 # TODO(jbudorick): Convert existing callers to AdbWrapper.GetAdbPath() and
 # remove this.
 def GetAdbPath():