Make apk_merger.py use hermetic timestamps.

android_webview/tools/apk_merger.py

 #!/usr/bin/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.
 
 """ Merges a 64-bit and a 32-bit APK into a single APK
 
 This script is used to merge two APKs which have only 32-bit or 64-bit
 binaries respectively into a APK that has both 32-bit and 64-bit binaries
 for 64-bit Android platform.
@@ skipping 101 matching lines @@
         '  unexpected files: %s' % pprint.pformat(unexpected_file_set))
   if missing_file_set:
     errors.append('  missing files: %s' % pprint.pformat(missing_file_set))
   if duplicate_file_set:
     errors.append('  duplicate files: %s' % pprint.pformat(duplicate_file_set))
 
   if errors:
     raise ApkMergeFailure(
         "Files don't match expectations:\n%s" % '\n'.join(errors))
 
-def AddDiffFiles(diff_files, tmp_dir_32, tmp_apk, expected_files,
+
+def AddDiffFiles(diff_files, tmp_dir_32, out_zip, expected_files,
                  component_build, uncompress_shared_libraries):
   """ Insert files only present in 32-bit APK into 64-bit APK (tmp_apk). """
-  old_dir = os.getcwd()
-  # Move into 32-bit directory to make sure the files we insert have correct
-  # relative paths.
-  os.chdir(tmp_dir_32)
-  try:
-    for diff_file in diff_files:
-      if component_build and diff_file.endswith('.so'):
-        extra_flags = []
-        if uncompress_shared_libraries:
-          extra_flags = ['-0']
-      else:
-        extra_flags = expected_files[os.path.basename(diff_file)]
-      build_utils.CheckOutput(
-          [
-              'zip', '-r', '-X', '--no-dir-entries', tmp_apk, diff_file
-          ] + extra_flags)
-  except build_utils.CalledProcessError as e:
-    raise ApkMergeFailure(
-        'Failed to add file %s to APK: %s' % (diff_file, e.output))
-  finally:
-    # Move out of 32-bit directory when done
-    os.chdir(old_dir)
-
-
-def RemoveMetafiles(tmp_apk):
-  """ Remove all meta info to avoid certificate clashes """
-  try:
-    build_utils.CheckOutput(['zip', '-d', tmp_apk, 'META-INF/*'])
-  except build_utils.CalledProcessError as e:
-    raise ApkMergeFailure('Failed to delete Meta folder: ' + e.output)
+  for diff_file in diff_files:
+    if component_build and diff_file.endswith('.so'):
+      compress = not uncompress_shared_libraries
+    else:
+      compress = expected_files[os.path.basename(diff_file)]
+    build_utils.AddToZipHermetic(out_zip,
+                                 diff_file,
+                                 os.path.join(tmp_dir_32, diff_file),
+                                 compress=compress)
 
 
 def SignAndAlignApk(tmp_apk, signed_tmp_apk, new_apk, zipalign_path,
                     keystore_path, key_name, key_password,
                     page_align_shared_libraries):
   try:
     finalize_apk.JarSigner(
         keystore_path,
         key_name,
         key_password,
@@ skipping 22 matching lines @@
         ret = 'mips64'
       elif abi == 'x86':
         ret = 'x86_64'
       else:
         raise ApkMergeFailure('Unsupported abi ' + abi)
   if ret == '':
     raise ApkMergeFailure('Failed to find secondary abi')
   return ret
 
 def MergeApk(args, tmp_apk, tmp_dir_32, tmp_dir_64):
-  # Expected files to copy from 32- to 64-bit APK together with an extra flag
-  # setting the compression level of the file
-  expected_files = {'snapshot_blob_32.bin': ['-0']}
+  # Expected files to copy from 32- to 64-bit APK together with whether to
+  # compress within the .apk.
+  expected_files = {'snapshot_blob_32.bin': False}
   if args.shared_library:
-    expected_files[args.shared_library] = []
-
+    expected_files[args.shared_library] = not args.uncompress_shared_libraries
   if args.debug:
-    expected_files['gdbserver'] = []
-  if args.uncompress_shared_libraries and args.shared_library:
-    expected_files[args.shared_library] += ['-0']
-
-  shutil.copyfile(args.apk_64bit, tmp_apk)
+    expected_files['gdbserver'] = True
 
   # need to unpack APKs to compare their contents
   UnpackApk(args.apk_64bit, tmp_dir_64)
   UnpackApk(args.apk_32bit, tmp_dir_32)
 
   ignores = ['META-INF', 'AndroidManifest.xml']
   if args.ignore_classes_dex:
     ignores += ['classes.dex', 'classes2.dex']
   if args.debug:
     # see http://crbug.com/648720
     ignores += ['webview_licenses.notice']
 
   dcmp = filecmp.dircmp(
       tmp_dir_64,
       tmp_dir_32,
       ignore=ignores)
 
   diff_files = GetDiffFiles(dcmp, tmp_dir_32)
 
   # Check that diff_files match exactly those files we want to insert into
   # the 64-bit APK.
   CheckFilesExpected(diff_files, expected_files, args.component_build)
 
-  RemoveMetafiles(tmp_apk)
-
-  AddDiffFiles(diff_files, tmp_dir_32, tmp_apk, expected_files,
-               args.component_build, args.uncompress_shared_libraries)
+  with zipfile.ZipFile(tmp_apk, 'w') as out_zip:
+    build_utils.MergeZips(out_zip, [args.apk_64bit],
+                          exclude_patterns=['META-INF/*'])
+    AddDiffFiles(diff_files, tmp_dir_32, out_zip, expected_files,
+                 args.component_build, args.uncompress_shared_libraries)
 
 
 def main():
   parser = argparse.ArgumentParser(
       description='Merge a 32-bit APK into a 64-bit APK')
   # Using type=os.path.abspath converts file paths to absolute paths so that
   # we can change working directory without affecting these paths
   parser.add_argument('--apk_32bit', required=True, type=os.path.abspath)
   parser.add_argument('--apk_64bit', required=True, type=os.path.abspath)
   parser.add_argument('--out_apk', required=True, type=os.path.abspath)
@@ skipping 34 matching lines @@
   except ApkMergeFailure as e:
     print e
     return 1
   finally:
     shutil.rmtree(tmp_dir)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())