build/android/gyp/util/build_utils.py - Issue 2193063002: [Android] [Reland] Sanitize APK signing file timestamps.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/gyp/util/build_utils.py

Issue 2193063002: [Android] [Reland] Sanitize APK signing file timestamps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address jbudorick's comments. 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

Index: build/android/gyp/util/build_utils.py

diff --git a/build/android/gyp/util/build_utils.py b/build/android/gyp/util/build_utils.py

index c7394e4e89f7a828942f87f1e4de1754f279a953..283934ccc2da10270760b82fa9f4d9c28f388831 100644

--- a/build/android/gyp/util/build_utils.py

+++ b/build/android/gyp/util/build_utils.py

@@ -28,7 +28,7 @@ COLORAMA_ROOT = os.path.join(host_paths.DIR_SOURCE_ROOT,

# aapt should ignore OWNERS files in addition the default ignore pattern.

AAPT_IGNORE_PATTERN = ('!OWNERS:!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:' +

'!CVS:!thumbs.db:!picasa.ini:!*~:!*.d.stamp')

-_HERMETIC_TIMESTAMP = (2001, 1, 1, 0, 0, 0)

+HERMETIC_TIMESTAMP = (2001, 1, 1, 0, 0, 0)

_HERMETIC_FILE_ATTR = (0644 << 16L)

@@ -267,7 +267,7 @@ def AddToZipHermetic(zip_file, zip_path, src_path=None, data=None,

assert (src_path is None) != (data is None), (

'|src_path| and |data| are mutually exclusive.')

CheckZipPath(zip_path)

- zipinfo = zipfile.ZipInfo(filename=zip_path, date_time=_HERMETIC_TIMESTAMP)

+ zipinfo = zipfile.ZipInfo(filename=zip_path, date_time=HERMETIC_TIMESTAMP)

zipinfo.external_attr = _HERMETIC_FILE_ATTR

if src_path and os.path.islink(src_path):

« no previous file with comments | « build/android/gyp/finalize_apk.py ('k') | no next file » | no next file with comments »