handle don't care regions in the system image
The system partitions has regions that we shouldn't write and can't
depend on the contents of. Adds a new script to generate a map of
these regions (using the sparse image as input), and include the map
in the package zip so it can be used when writing or patching the
system partition.
Also fixes a bug where the wrong SELinux file contexts are used when
generating incrementals.
Change-Id: Iaca5b967a3b7d1df843c7c21becc19b3f1633dad
diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files
index a7936b1..59dd06e 100755
--- a/tools/releasetools/ota_from_target_files
+++ b/tools/releasetools/ota_from_target_files
@@ -461,8 +461,14 @@
script.ShowProgress(system_progress, 30)
if block_based:
- img_from_target_files.AddSystem(output_zip, sparse=False)
- script.WriteRawImage("/system", "system.img")
+ mapdata, data = img_from_target_files.BuildSystem(
+ OPTIONS.input_tmp, OPTIONS.info_dict,
+ sparse=False, map_file=True)
+
+ common.ZipWriteStr(output_zip, "system.map", mapdata)
+ common.ZipWriteStr(output_zip, "system.muimg", data)
+ script.WipeBlockDevice("/system")
+ script.WriteRawImage("/system", "system.muimg", mapfn="system.map")
else:
script.FormatPartition("/system")
script.Mount("/system")
@@ -608,8 +614,10 @@
with tempfile.NamedTemporaryFile() as tgt_file:
print "building source system image..."
src_file = tempfile.NamedTemporaryFile()
- src_data = img_from_target_files.BuildSystem(
- OPTIONS.source_tmp, OPTIONS.source_info_dict, sparse=False)
+ src_mapdata, src_data = img_from_target_files.BuildSystem(
+ OPTIONS.source_tmp, OPTIONS.source_info_dict,
+ sparse=False, map_file=True)
+
src_sys_sha1 = sha1(src_data).hexdigest()
print "source system sha1:", src_sys_sha1
src_file.write(src_data)
@@ -617,8 +625,9 @@
print "building target system image..."
tgt_file = tempfile.NamedTemporaryFile()
- tgt_data = img_from_target_files.BuildSystem(
- OPTIONS.target_tmp, OPTIONS.target_info_dict, sparse=False)
+ tgt_mapdata, tgt_data = img_from_target_files.BuildSystem(
+ OPTIONS.target_tmp, OPTIONS.target_info_dict,
+ sparse=False, map_file=True)
tgt_sys_sha1 = sha1(tgt_data).hexdigest()
print "target system sha1:", tgt_sys_sha1
tgt_sys_len = len(tgt_data)
@@ -628,6 +637,10 @@
system_type, system_device = common.GetTypeAndDevice("/system", OPTIONS.info_dict)
system_patch = common.MakeSystemPatch(src_file, tgt_file)
system_patch.AddToZip(output_zip, compression=zipfile.ZIP_STORED)
+ src_mapfilename = system_patch.name + ".src.map"
+ common.ZipWriteStr(output_zip, src_mapfilename, src_mapdata)
+ tgt_mapfilename = system_patch.name + ".tgt.map"
+ common.ZipWriteStr(output_zip, tgt_mapfilename, tgt_mapdata)
AppendAssertions(script, OPTIONS.target_info_dict)
device_specific.IncrementalOTA_Assertions()
@@ -713,9 +726,8 @@
script.Print("Patching system image...")
script.Syspatch(system_device,
- OPTIONS.info_dict["system_size"],
- tgt_sys_sha1,
- src_sys_sha1,
+ tgt_mapfilename, tgt_sys_sha1,
+ src_mapfilename, src_sys_sha1,
system_patch.name)
if OPTIONS.two_step:
@@ -1249,6 +1261,9 @@
OPTIONS.source_tmp, source_zip = common.UnzipTemp(OPTIONS.incremental_source)
OPTIONS.target_info_dict = OPTIONS.info_dict
OPTIONS.source_info_dict = common.LoadInfoDict(source_zip)
+ if "selinux_fc" in OPTIONS.source_info_dict:
+ OPTIONS.source_info_dict["selinux_fc"] = os.path.join(OPTIONS.source_tmp, "BOOT", "RAMDISK",
+ "file_contexts")
if OPTIONS.package_key is None:
OPTIONS.package_key = OPTIONS.source_info_dict.get(
"default_system_dev_certificate",