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

third_party/android_platform/development/scripts/stack

 #!/usr/bin/env python
 #
 # Copyright (C) 2013 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 168 matching lines @@
       packed_relocation_adjustments = True
     elif option == "--no-packed-relocation-adjustments":
       packed_relocation_adjustments = False
     elif option == "--more-info":
       more_info = True
     elif option == "--less-info":
       more_info = False
     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
   else:
     print "Searching for native crashes in: " + os.path.realpath(arguments[0])
     f = open(arguments[0], "r")
 
   lines = f.readlines()
   f.close()
 
@@ skipping 39 matching lines @@
   if rootdir:
     # be a good citizen and clean up...os.rmdir and os.removedirs() don't work
     cmd = "rm -rf \"%s\"" % rootdir
     print "\ncleaning up (%s)" % cmd
     os.system(cmd)
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))
 
 # vi: ts=2 sw=2