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

third_party/android_platform/development/scripts/stack

Index: third_party/android_platform/development/scripts/stack
diff --git a/third_party/android_platform/development/scripts/stack b/third_party/android_platform/development/scripts/stack
index 87f2c3abc0ac6b3559a1d7e4cfb9ff0c1ea65b47..59d7ebfde794c04566fd95983e0c231f8154d766 100755
--- a/third_party/android_platform/development/scripts/stack
+++ b/third_party/android_platform/development/scripts/stack
@@ -186,13 +186,19 @@ def main(argv):
     elif option == "--verbose":
       logging.basicConfig(level=logging.DEBUG)
 
-  if symbol.CHROME_SYMBOLS_DIR and not chrome_apk_dir:
-    chrome_apk_dir = os.path.join(symbol.CHROME_SYMBOLS_DIR,
-                                  '..', DEFAULT_APK_DIR)
-
   if len(arguments) > 1:
     PrintUsage()
 
+  # Do an up-front test that the output directory is known.
+  if not symbol.CHROME_SYMBOLS_DIR:
+    constants.CheckOutputDirectory()
+
+  if not chrome_apk_dir:
+    # TODO(agrieve): This directory doesn't exist with GN.
+    probable_dir = os.path.join(constants.GetOutDirectory(), DEFAULT_APK_DIR)
+    if os.path.exists(probable_dir):
+      chrome_apk_dir = probable_dir
+
   if not arguments or arguments[0] == "-":
     print "Reading native crash info from stdin"
     f = sys.stdin