am 9a5afa52: am 5e23069b: Merge "build_image.py: Use a fixed timestamp in the generated image."

* commit '9a5afa5242a4d179fc45f59944c0fba5ccaa4c15':
  build_image.py: Use a fixed timestamp in the generated image.
This commit is contained in:
Tao Bao 2015-09-28 21:24:38 +00:00 committed by Android Git Automerger
commit 5b8bd02ed4

View file

@ -20,6 +20,7 @@ Build image output_image_file from input_directory and properties_file.
Usage: build_image input_directory properties_file output_image_file
"""
import datetime
import os
import os.path
import re
@ -399,10 +400,12 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
mount_point: such as "system", "data" etc.
"""
d = {}
if "build.prop" in glob_dict:
bp = glob_dict["build.prop"]
if "ro.build.date.utc" in bp:
d["timestamp"] = bp["ro.build.date.utc"]
# Use a fixed timestamp (01/01/2009) for all the files in an image.
# Bug: 24377993
epoch = datetime.datetime.fromtimestamp(0)
timestamp = (datetime.datetime(2009, 1, 1) - epoch).total_seconds()
d["timestamp"] = int(timestamp)
def copy_prop(src_p, dest_p):
if src_p in glob_dict: