StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.

Browse Source 
* commit 'e09359abc0f8c29fbb16d35ab7375d80fde6f931':
  DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
This commit is contained in:
Tao Bao
2015-10-17 00:09:35 +00:00
committed by Android Git Automerger
parent 57a64e015c e09359abc0
commit 46ae586ab2
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/releasetools/common.py
View File

@@ -59,6 +59,8 @@ class Options(object):
self.device_specific = None self.device_specific = None
self.extras = {} self.extras = {}
self.info_dict = None self.info_dict = None
self.source_info_dict = None
self.target_info_dict = None
self.worker_threads = None self.worker_threads = None
@@ -1195,7 +1197,11 @@ class BlockDifference(object):
self.path = os.path.join(tmpdir, partition) self.path = os.path.join(tmpdir, partition)
b.Compute(self.path) b.Compute(self.path)
_, self.device = GetTypeAndDevice("/" + partition, OPTIONS.info_dict) if src is None:
_, self.device = GetTypeAndDevice("/" + partition, OPTIONS.info_dict)
else:
_, self.device = GetTypeAndDevice("/" + partition,
OPTIONS.source_info_dict)
def WriteScript(self, script, output_zip, progress=None): def WriteScript(self, script, output_zip, progress=None):
if not self.src: if not self.src:
@@ -1393,6 +1399,8 @@ def MakeRecoveryPatch(input_dir, output_sink, recovery_img, boot_img,
output_sink("recovery-from-boot.p", patch) output_sink("recovery-from-boot.p", patch)
try: try:
# The following GetTypeAndDevice()s need to use the path in the target
# info_dict instead of source_info_dict.
boot_type, boot_device = GetTypeAndDevice("/boot", info_dict) boot_type, boot_device = GetTypeAndDevice("/boot", info_dict)
recovery_type, recovery_device = GetTypeAndDevice("/recovery", info_dict) recovery_type, recovery_device = GetTypeAndDevice("/recovery", info_dict)
except KeyError: except KeyError:

4
tools/releasetools/ota_from_target_files.py
View File

@@ -759,7 +759,7 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip):
output_zip=output_zip, output_zip=output_zip,
script=script, script=script,
metadata=metadata, metadata=metadata,
info_dict=OPTIONS.info_dict) info_dict=OPTIONS.source_info_dict)
# TODO: Currently this works differently from WriteIncrementalOTAPackage(). # TODO: Currently this works differently from WriteIncrementalOTAPackage().
# This function doesn't consider thumbprints when writing # This function doesn't consider thumbprints when writing
@@ -1159,7 +1159,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
output_zip=output_zip, output_zip=output_zip,
script=script, script=script,
metadata=metadata, metadata=metadata,
info_dict=OPTIONS.info_dict) info_dict=OPTIONS.source_info_dict)
system_diff = FileDifference("system", source_zip, target_zip, output_zip) system_diff = FileDifference("system", source_zip, target_zip, output_zip)
script.Mount("/system", recovery_mount_options) script.Mount("/system", recovery_mount_options)