diff options
author | Tao Bao <tbao@google.com> | 2015-10-17 00:13:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-17 00:13:36 +0000 |
commit | 5631d5c6e12937fd50ef576c6cff1c7ed7c5ae1b (patch) | |
tree | d73317f320681b260190d91fe7cb61b7ae5ec119 /tools/releasetools | |
parent | b70b496fd7574120e61e5e4ea3d63cf6192ba785 (diff) | |
parent | 46ae586ab26f5bf63baaac6c68942f1bfba4addc (diff) | |
download | build-5631d5c6e12937fd50ef576c6cff1c7ed7c5ae1b.zip build-5631d5c6e12937fd50ef576c6cff1c7ed7c5ae1b.tar.gz build-5631d5c6e12937fd50ef576c6cff1c7ed7c5ae1b.tar.bz2 |
am 46ae586a: am e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '46ae586ab26f5bf63baaac6c68942f1bfba4addc':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Diffstat (limited to 'tools/releasetools')
-rw-r--r-- | tools/releasetools/common.py | 10 | ||||
-rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 3c3d2ed..2965fa8 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -59,6 +59,8 @@ class Options(object): self.device_specific = None self.extras = {} self.info_dict = None + self.source_info_dict = None + self.target_info_dict = None self.worker_threads = None @@ -1195,7 +1197,11 @@ class BlockDifference(object): self.path = os.path.join(tmpdir, partition) 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): 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) 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) recovery_type, recovery_device = GetTypeAndDevice("/recovery", info_dict) except KeyError: diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index e5a30ad..c5c16b4 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -759,7 +759,7 @@ def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_zip): output_zip=output_zip, script=script, metadata=metadata, - info_dict=OPTIONS.info_dict) + info_dict=OPTIONS.source_info_dict) # TODO: Currently this works differently from WriteIncrementalOTAPackage(). # This function doesn't consider thumbprints when writing @@ -1159,7 +1159,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): output_zip=output_zip, script=script, metadata=metadata, - info_dict=OPTIONS.info_dict) + info_dict=OPTIONS.source_info_dict) system_diff = FileDifference("system", source_zip, target_zip, output_zip) script.Mount("/system", recovery_mount_options) |