tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "DO NOT MERGE: Only use a fixed timestamp when packaging." into mnc-dr-dev

Browse source
This commit is contained in:
Tao Bao 2015-10-12 18:39:11 +00:00 committed by Android (Google) Code Review
commit b03d55aaeb
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools/releasetools/add_img_to_target_files.py
View file

@ -28,6 +28,7 @@ if sys.hexversion < 0x02070000:
print >> sys.stderr, "Python 2.7 or newer is required." print >> sys.stderr, "Python 2.7 or newer is required."
sys.exit(1) sys.exit(1)
import datetime
import errno import errno
import os import os
import tempfile import tempfile
@ -122,6 +123,12 @@ def CreateImage(input_dir, info_dict, what, block_list=None):
if fstab: if fstab:
image_props["fs_type"] = fstab["/" + what].fs_type image_props["fs_type"] = fstab["/" + what].fs_type
# Use a fixed timestamp (01/01/2009) when packaging the image.
# Bug: 24377993
epoch = datetime.datetime.fromtimestamp(0)
timestamp = (datetime.datetime(2009, 1, 1) - epoch).total_seconds()
image_props["timestamp"] = int(timestamp)
if what == "system": if what == "system":
fs_config_prefix = "" fs_config_prefix = ""
else: else:
@ -173,6 +180,12 @@ def AddUserdata(output_zip, prefix="IMAGES/"):
print "creating userdata.img..." print "creating userdata.img..."
# Use a fixed timestamp (01/01/2009) when packaging the image.
# Bug: 24377993
epoch = datetime.datetime.fromtimestamp(0)
timestamp = (datetime.datetime(2009, 1, 1) - epoch).total_seconds()
image_props["timestamp"] = int(timestamp)
# The name of the directory it is making an image out of matters to # The name of the directory it is making an image out of matters to
# mkyaffs2image. So we create a temp dir, and within it we create an # mkyaffs2image. So we create a temp dir, and within it we create an
# empty dir named "data", and build the image from that. # empty dir named "data", and build the image from that.
@ -210,6 +223,12 @@ def AddCache(output_zip, prefix="IMAGES/"):
print "creating cache.img..." print "creating cache.img..."
# Use a fixed timestamp (01/01/2009) when packaging the image.
# Bug: 24377993
epoch = datetime.datetime.fromtimestamp(0)
timestamp = (datetime.datetime(2009, 1, 1) - epoch).total_seconds()
image_props["timestamp"] = int(timestamp)
# The name of the directory it is making an image out of matters to # The name of the directory it is making an image out of matters to
# mkyaffs2image. So we create a temp dir, and within it we create an # mkyaffs2image. So we create a temp dir, and within it we create an
# empty dir named "cache", and build the image from that. # empty dir named "cache", and build the image from that.

1
tools/releasetools/build_image.py
View file

@ -399,6 +399,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
mount_point: such as "system", "data" etc. mount_point: such as "system", "data" etc.
""" """
d = {} d = {}
if "build.prop" in glob_dict: if "build.prop" in glob_dict:
bp = glob_dict["build.prop"] bp = glob_dict["build.prop"]
if "ro.build.date.utc" in bp: if "ro.build.date.utc" in bp: