Upload symbols when uploading artifacts.

tools/upload_service.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 import argparse
+import glob
 import imp
+import itertools
 import os
 import subprocess
 import sys
 import tempfile
 import time
 import zipfile
 
+sys.path.append(os.path.join(os.path.dirname(__file__),
+                             os.pardir, 'third_party', 'pyelftools'))
+import elftools.elf.elffile as elffile
+
+sys.path.append(os.path.join(os.path.dirname(__file__),
+                             os.pardir, 'third_party', 'mojo_devtools'))
+import android_gdb.signatures as signatures
+
 SERVICES = ["network_service", "network_service_apptests"]
 
 # A service does not need to expose interfaces. Those that do expose interfaces
 # have their mojoms located in the directories listed below, in paths relative
 # to the directory of this script.
 MOJOMS_IN_DIR = {
     "network_service": os.path.join("network", "public", "interfaces")
 }
 
 # The network service is downloaded out-of-band rather than dynamically by the
@@ skipping 54 matching lines @@
   with tempfile.NamedTemporaryFile() as mojom_zip_file:
     with zipfile.ZipFile(mojom_zip_file, 'w') as z:
       for root, _, files in os.walk(absolute_mojom_directory_path):
         for filename in files:
           absolute_file_path = os.path.join(root, filename)
           relative_file_path = os.path.relpath(absolute_file_path, root)
           z.write(absolute_file_path, relative_file_path)
     gsutil_cp(mojom_zip_file.name, dest, dry_run)
 
 
+def upload_symbols(binary_dir, dry_run):
+  dest_dir = "gs://mojo/symbols/"
+  symbols_dir = os.path.join(binary_dir, "symbols")
+  for name in os.listdir(symbols_dir):
+    path = os.path.join(symbols_dir, name)
+    with open(path) as f:
+      signature = signatures.get_signature(f, elffile)
+      if signature is not None:
+        dest = dest_dir + signature
+        gsutil_cp(path, dest, dry_run)
+
 def upload_binary(version_name, service, binary_dir, platform, dry_run):
   dest_dir = "gs://mojo/" + service + "/" + version_name + "/" + platform + "/"
   should_zip = service in SERVICES_WITH_ZIPPED_BINARIES
   binary_name = service + ".mojo"
   absolute_binary_path = os.path.join(root_path, binary_dir, binary_name)
 
   if not should_zip:
     # Upload the binary.
     dest = dest_dir + binary_name
     gsutil_cp(absolute_binary_path, dest, dry_run)
@@ skipping 34 matching lines @@
       "--android-arm-binary-dir",
       help="Path to the dir containing the android-arm service binary relative "
            "to the repo root, e.g. out/android_Release")
   parser.add_argument("service",
                       help="The service to be uploaded (one of %s)" % SERVICES)
   parser.add_argument(
       "--custom-build", action="store_true",
       help="Indicates that this is a build with change that is not committed. "
            "The change must be uploaded to Rietveld. The script needs to be "
            "run from the branch associated with the change.")
+  parser.add_argument(
+      "--upload-symbols", action="store_true",
+      help="Indicates that this should also upload all symbols.")
   args = parser.parse_args()
 
   if args.service not in SERVICES:
     print args.service + " is not one of the recognized services:"
     print SERVICES
     return 1
 
   version_name = get_version_name(args.custom_build)
   if args.custom_build and not version_name:
     print ("When uploading a custom build, the corresponding change to source "
            "code must be uploaded to Rietveld. Besides, this script needs to "
            "be run from the branch associated with the change.")
     return 1
 
   if args.service in MOJOMS_IN_DIR:
     script_dir = os.path.dirname(os.path.realpath(__file__))
     absolute_mojom_directory_path = os.path.join(script_dir,
                                                  MOJOMS_IN_DIR[args.service])
     upload_mojoms(version_name, args.service, absolute_mojom_directory_path,
                   args.dry_run)
 
   if args.linux_x64_binary_dir:
     upload_binary(version_name, args.service, args.linux_x64_binary_dir,
                   "linux-x64", args.dry_run)
+    if args.upload_symbols:
+      upload_symbols(args.linux_x64_binary_dir, args.dry_run)
 
   if args.android_arm_binary_dir:
     upload_binary(version_name, args.service, args.android_arm_binary_dir,
                   "android-arm", args.dry_run)
+    if args.upload_symbols:
+      upload_symbols(args.android_arm_binary_dir, args.dry_run)
 
   if not args.dry_run:
     print "Uploaded artifacts for version %s" % (version_name, )
   else:
     print "No artifacts uploaded (dry run)"
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())