p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 279bae71: am 15604b84: use imgdiff -z to diff zipfiles 

Merge commit '279bae719765f4fb9fc372323d680690b5842f90'

* commit '279bae719765f4fb9fc372323d680690b5842f90':
  use imgdiff -z to diff zipfiles
This commit is contained in:
Doug Zongker 2009-09-02 13:33:28 -07:00 committed by Android Git Automerger
parent c2b5b036d4 279bae7197
commit 99677d23a2
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/releasetools/ota_from_target_files
View File

@ -481,6 +481,15 @@ def GetRecoveryAPIVersion(zip):
except KeyError:
return 0
DIFF_METHOD_BY_EXT = {
".gz" : "imgdiff",
".zip" : ["imgdiff", "-z"],
".jar" : ["imgdiff", "-z"],
".apk" : ["imgdiff", "-z"],
}
def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
source_version = GetRecoveryAPIVersion(source_zip)
@ -526,9 +535,8 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
verbatim_targets.append((fn, tf.size))
elif tf.sha1 != sf.sha1:
# File is different; consider sending as a patch
diff_method = "bsdiff"
if tf.name.endswith(".gz"):
diff_method = "imgdiff"
ext = os.path.splitext(tf.name)[1]
diff_method = DIFF_METHOD_BY_EXT.get(ext, "bsdiff")
d = Difference(tf, sf, diff_method)
if d is not None:
print fn, tf.size, len(d), (float(len(d)) / tf.size)