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

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,
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)