Add x86/x64 upload support

mojo/services/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 imp
 import os
 import subprocess
 import sys
@@ skipping 85 matching lines @@
       description="Upload service mojoms and binaries to Google storage")
   parser.add_argument("-n", "--dry-run", action="store_true", help="Dry run")
   parser.add_argument(
       "--linux-x64-binary-dir",
       help="Path to the dir containing the linux-x64 service binary relative "
            "to the repo root, e.g. out/Release")
   parser.add_argument(
       "--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(
+      "--android-x86-binary-dir",
+      help="Path to the dir containing the android-x86 service binary relative "
+           "to the repo root, e.g. out/android_Release")
+  parser.add_argument(
+      "--android-x64-binary-dir",
+      help="Path to the dir containing the android-x64 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)
 
   args = parser.parse_args()
 
   if args.service not in SERVICES:
     print args.service + " is not one of the recognized services:"
     print SERVICES
     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(args.service, absolute_mojom_directory_path, args.dry_run)
 
   if args.linux_x64_binary_dir:
     upload_binary(args.service, args.linux_x64_binary_dir,
                   "linux-x64", args.dry_run)
 
   if args.android_arm_binary_dir:
     upload_binary(args.service, args.android_arm_binary_dir,
                   "android-arm", args.dry_run)
 
+  if args.android_x86_binary_dir:
+    upload_binary(args.service, args.android_arm_binary_dir,
+                  "android-x86", args.dry_run)
+
+  if args.android_x64_binary_dir:
+    upload_binary(args.service, args.android_arm_binary_dir,
+                  "android-x64", args.dry_run)
+
   if not args.dry_run:
     print "Uploaded artifacts for version %s" % (version, )
   else:
     print "No artifacts uploaded (dry run)"
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())