Enable saving the same file in multiple archives

scripts/common/archive_utils.py

 # Copyright (c) 2012 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.
 
 """Set of common operations/utilities for build archiving."""
 
 import glob
 import os
 import platform
 import re
@@ skipping 119 matching lines @@
     return (len(archive_list) == 1 and
             (fileobj['filename'] == fileobj['archive'] or
              fileobj.get('direct_archive')))
 
   def IsOptional(self, filename):
     """Determine if the given filename is marked optional for this config."""
     found_optional = False
     for fileobj in self._files_list:
       if fileobj['filename'] == filename:
         found_optional = True
-        if self._buildtype not in fileobj['optional']:
+        if self._buildtype not in fileobj.get('optional', []):
           return False
     return found_optional
 
   def ParseGroup(self, filegroup):
     """Return the list of filenames in the given group (e.g. "symbols")."""
     return [fileobj['filename'] for fileobj in self._files_list
         if (fileobj.get('filegroup') and filegroup in fileobj.get('filegroup'))
     ]
 
   def ParseArchiveLists(self):
@@ skipping 174 matching lines @@
                                                raise_error=not allow_missing)
   if not os.path.exists(zip_file):
     raise StagingError('Failed to make zip package %s' % zip_file)
 
   if os.path.basename(zip_file) != archive_name:
     orig_zip = zip_file
     zip_file = os.path.join(os.path.dirname(orig_zip), archive_name)
     print 'Renaming archive: "%s" -> "%s"' % (orig_zip, zip_file)
     chromium_utils.MoveFile(orig_zip, zip_file)
   return (zip_dir, zip_file)