Allowing zip_build to use a file name given in build_url.

scripts/slave/recipe_modules/archive/api.py

 # Copyright 2013 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 re
 
 from recipe_engine import recipe_api
 
 
 # TODO(machenbach): Chromium specific data should move out of the archive
@@ skipping 88 matching lines @@
       src_dir = self.m.path['checkout']
     args = [
         '--show-path',
         'python',
         self.package_repo_resource('scripts', 'slave', 'zip_build.py'),
         '--target', target,
         '--gsutil-py-path', self.m.depot_tools.gsutil_py_path,
         '--staging-dir', self.m.path['cache'].join('chrome_staging'),
         '--src-dir', src_dir,
     ]
-    if build_url or 'build_archive_url' in self.m.properties:
-      args.extend(['--build-url',
-                   build_url or self.m.properties['build_archive_url']])
+    if 'build_archive_url' in self.m.properties:
+      args.extend(['--use-build-url-name', '--build-url',
+                   self.m.properties['build_archive_url']])
+    elif build_url:
+      args.extend(['--build-url', build_url])
     if build_revision:
       args.extend(['--build_revision', build_revision])
     if cros_board:
       args.extend(['--cros-board', cros_board])
     if package_dsym_files:
       args.append('--package-dsym-files')
     if exclude_files:
       args.extend(['--exclude-files', exclude_files])
     if 'gs_acl' in self.m.properties:
       args.extend(['--gs-acl', self.m.properties['gs_acl']])
@@ skipping 42 matching lines @@
     If none of the candidate configurations are present, the value None will be
     returned.
     """
     if primary_project:
       commit = update_properties.get('got_%s_revision_git' % primary_project)
       if commit:
         return commit
       commit = update_properties.get('got_%s_revision' % primary_project)
       if commit and GIT_COMMIT_HASH_RE.match(commit):
         return commit
-    
+
     commit = update_properties.get('got_revision_git')
     if commit:
       return commit
     commit = update_properties.get('got_revision')
     if commit and GIT_COMMIT_HASH_RE.match(commit):
       return commit
     return None
 
   def _get_comparable_upload_path_for_sort_key(self, branch, number):
     """Returns a sortable string corresponding to the commit position."""
@@ skipping 222 matching lines @@
   def legacy_download_url(self, gs_bucket_name, extra_url_components=None):
     """Returns a url suitable for downloading a Chromium build from
     Google Storage.
 
     extra_url_components, if specified, should be a string without a
     trailing '/' which is inserted in the middle of the URL.
 
     The builder_name, or parent_buildername, is always automatically
     inserted into the URL."""
     return self._legacy_url(True, gs_bucket_name, extra_url_components)