swarming: Don't normalize .apk files (breaks alignment)

tools/determinism/remove_build_metadata.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.
 """Remove the build metadata embedded in the artifacts of a build."""
 
 import json
 import multiprocessing
 import optparse
 import os
@@ skipping 10 matching lines @@
 SRC_DIR = os.path.dirname(os.path.dirname(BASE_DIR))
 
 # Files that can't be processed by zap_timestamp.exe.
 _ZAP_TIMESTAMP_BLACKLIST = {
   'mini_installer.exe',
 }
 
 def get_files_to_clean(build_dir, recursive=False):
   """Get the list of files to clean."""
   allowed = frozenset(
-      ('', '.apk', '.app', '.dll', '.dylib', '.exe', '.nexe', '.so'))
-  non_x_ok_exts = frozenset(('.apk', '.isolated', '.jar'))
+      ('', '.app', '.dll', '.dylib', '.exe', '.nexe', '.so'))
+  non_x_ok_exts = frozenset(('.isolated', '.jar'))
   min_timestamp = 0
   if os.path.exists(os.path.join(build_dir, 'build.ninja')):
     min_timestamp = os.path.getmtime(os.path.join(build_dir, 'build.ninja'))
 
   def check(f):
     if not os.path.isfile(f) or os.path.basename(f).startswith('.'):
       return False
     if os.path.getmtime(os.path.join(build_dir, f)) < min_timestamp:
       return False
     ext = os.path.splitext(f)[1]
@@ skipping 28 matching lines @@
   """Remove the build metadata from a PE file."""
   # Only run zap_timestamp on the PE files for which we have a PDB.
   ret = 0
   if ((not os.path.basename(filename) in _ZAP_TIMESTAMP_BLACKLIST) and
       os.path.exists(filename + '.pdb')):
     ret = run_zap_timestamp(filename)
   return ret
 
 
 def remove_zip_timestamps(filename):
-  """Remove the timestamps embedded in an apk archive."""
+  """Remove the timestamps embedded in a zip archive."""
   sys.stdout.write('Processing: %s\n' % os.path.basename(filename))
   with zipfile.ZipFile(filename, 'r') as zf:
     # Creates a temporary file.
     out_file, out_filename = tempfile.mkstemp(prefix='remote_apk_timestamp')
     os.close(out_file)
     try:
       with zipfile.ZipFile(out_filename, 'w') as zf_o:
         # Copy the data from the original file to the new one.
         for info in zf.infolist():
           # Overwrite the timestamp with a constant value.
           info.date_time = (1980, 1, 1, 0, 0, 0)
           zf_o.writestr(info, zf.read(info.filename))
       # Remove the original file and replace it by the modified one.
       os.remove(filename)
       shutil.move(out_filename, filename)
     finally:
       if os.path.isfile(out_filename):
         os.remove(out_filename)
 
 
 def remove_metadata_worker(file_queue, failed_queue, build_dir):
   """Worker thread for the remove_metadata function."""
   while True:
     f = file_queue.get()
     if f.endswith(('.dll', '.exe')):
       if remove_pe_metadata(os.path.join(build_dir, f)):
         failed_queue.put(f)
-    elif f.endswith(('.apk', '.jar')):
+    elif f.endswith('.jar'):
       remove_zip_timestamps(os.path.join(build_dir, f))
     file_queue.task_done()
 
 
 def remove_metadata(build_dir, recursive):
   """Remove the build metadata from the artifacts of a build."""
   with open(os.path.join(BASE_DIR, 'deterministic_build_blacklist.json')) as f:
     blacklist = frozenset(json.load(f))
   files = Queue.Queue()
   for f in get_files_to_clean(build_dir, recursive) - blacklist:
@@ skipping 30 matching lines @@
   options, _ = parser.parse_args()
 
   if not options.build_dir:
     parser.error('--build-dir is required')
 
   return remove_metadata(options.build_dir, options.recursive)
 
 
 if __name__ == '__main__':
   sys.exit(main())