[Android] [Reland] Sanitize APK signing file timestamps.

build/android/gyp/finalize_apk.py

 #!/usr/bin/env python
 #
 # 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.
 """Signs and zipaligns APK.
 
 """
 
 import optparse
+import os
 import shutil
 import sys
 import tempfile
+import zipfile
+
+# resource_sizes modifies zipfile for zip64 compatibility. See
+# https://bugs.python.org/issue14315.
+sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir))
+import resource_sizes  # pylint: disable=unused-import
 
 from util import build_utils
 
 def RenameInflateAndAddPageAlignment(
     rezip_apk_jar_path, in_zip_file, out_zip_file):
   rezip_apk_cmd = [
       'java',
       '-classpath',
       rezip_apk_jar_path,
       'RezipApk',
@@ skipping 112 matching lines @@
       apk_to_sign = apk_to_sign_tmp.name
       RenameInflateAndAddPageAlignment(
           options.rezip_apk_jar_path, options.unsigned_apk_path, apk_to_sign)
     else:
       apk_to_sign = options.unsigned_apk_path
 
     signed_apk_path = signed_apk_path_tmp.name
     JarSigner(options.key_path, options.key_name, options.key_passwd,
               apk_to_sign, signed_apk_path)
 
+    # Make the signing files hermetic.
+    with tempfile.NamedTemporaryFile(suffix='.zip') as hermetic_signed_apk:
+      with zipfile.ZipFile(signed_apk_path, 'r') as zi:
+        with zipfile.ZipFile(hermetic_signed_apk, 'w') as zo:
+          for info in zi.infolist():
+            # Ignore 'extended local file headers'. Python doesn't write them
+            # properly (see https://bugs.python.org/issue1742205) which causes
+            # zipalign to miscalculate alignment. Since we don't use them except
+            # for alignment anyway, we write a stripped file here and let
+            # zipalign add them properly later. eLFHs are controlled by 'general
+            # purpose bit flag 03' (0x08) so we mask that out.
+            info.flag_bits = info.flag_bits & 0xF7
+
+            info.date_time = build_utils.HERMETIC_TIMESTAMP
+            zo.writestr(info, zi.read(info.filename))
+
+      shutil.copy(hermetic_signed_apk.name, signed_apk_path)
+
     if options.load_library_from_zip:
       # Reorder the contents of the APK. This re-establishes the canonical
       # order which means the library will be back at its page aligned location.
       # This step also aligns uncompressed items to 4 bytes.
       ReorderAndAlignApk(
           options.rezip_apk_jar_path, signed_apk_path, options.final_apk_path)
     else:
       # Align uncompressed items to 4 bytes
       AlignApk(options.zipalign_path,
                options.page_align_shared_libraries,
                signed_apk_path,
                options.final_apk_path)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))