Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(630)

Unified Diff: build/android/gyp/finalize_apk.py

Issue 2176023002: [Android] Sanitize APK signing file timestamps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/android/gyp/util/build_utils.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/finalize_apk.py
diff --git a/build/android/gyp/finalize_apk.py b/build/android/gyp/finalize_apk.py
index d71cb8fc7e7704fa58c20bebb2af6e83789d59bd..bf389320397416f7e3e192e87c22773ea4dedd09 100755
--- a/build/android/gyp/finalize_apk.py
+++ b/build/android/gyp/finalize_apk.py
@@ -11,6 +11,7 @@ import optparse
import shutil
import sys
import tempfile
+import zipfile
from util import build_utils
@@ -143,6 +144,15 @@ def FinalizeApk(options):
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():
+ 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.
« no previous file with comments | « no previous file | build/android/gyp/util/build_utils.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698