Allow several build directories to be specified to search for symbols

mojo/devtools/common/android_stack_parser/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 81 matching lines @@
   for option, value in options:
     if option == "--help":
       PrintUsage()
     elif option == "--symbols-dir":
       symbol.SYMBOLS_DIR = os.path.expanduser(value)
     elif option == "--symbols-zip":
       zip_arg = os.path.expanduser(value)
     elif option == "--arch":
       symbol.ARCH = value
     elif option == "--build-dir":
-      symbol.BUILD_DIR = value
+      symbol.BUILD_DIRS = value.split(',')
     elif option == "--ndk-dir":
       symbol.NDK_DIR = value
     elif option == "--more-info":
       more_info = True
     elif option == "--less-info":
       more_info = False
 
-  if not symbol.BUILD_DIR:
+  if not symbol.BUILD_DIRS:
     guess = stack_utils.GuessDir(_DEFAULT_BUILD_DIR)
     if not guess:
       print "Couldn't find the build directory, please pass --build-dir."
       return 1
     print "Inferring the build directory path as " + guess
-    symbol.BUILD_DIR = guess
+    symbol.BUILD_DIRS = [guess]
 
   if not symbol.NDK_DIR:
     guess = stack_utils.GuessDir(_DEFAULT_NDK_DIR)
     if not guess:
       print "Couldn't find the Android NDK, please pass --ndk-dir."
       return 1
     print "Inferring the Android NDK path as " + guess
     symbol.NDK_DIR = guess
 
 
@@ skipping 10 matching lines @@
   lines = f.readlines()
   f.close()
 
   rootdir = None
   if zip_arg:
     rootdir, symbol.SYMBOLS_DIR = stack_utils.UnzipSymbols(zip_arg)
 
   if symbol.SYMBOLS_DIR:
     print "Reading Android symbols from", symbol.SYMBOLS_DIR
 
-  print "Reading Mojo symbols from", symbol.BUILD_DIR
+  print "Reading Mojo symbols from", symbol.BUILD_DIRS

[ppi, 2015/08/27 15:25:59]

Drop "Mojo"?

[etiennej, 2015/08/27 15:29:54]

Done.

   stack_core.ConvertTrace(lines, more_info, stack_utils.GetSymbolMapping(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__":
   main()
 
 # vi: ts=2 sw=2