eliminate meaningless non-zero values of ramdisk_offset

- Fix: issue #38
 - sync change of
https://android-review.googlesource.com/c/platform/system/tools/mkbootimg/+/1087679
 - also change integrationTest
pull/41/head
cfig 5 years ago
parent e47b10e013
commit b21e856754
No known key found for this signature in database
GPG Key ID: B104C307F0FDABB7

@ -196,6 +196,7 @@ open class BootImgHeader(
//refresh ramdisk size //refresh ramdisk size
if (0U == this.ramdiskLength) { if (0U == this.ramdiskLength) {
param.ramdisk = null param.ramdisk = null
this.ramdiskOffset = 0U
} else { } else {
this.ramdiskLength = File(param.ramdisk!!).length().toUInt() this.ramdiskLength = File(param.ramdisk!!).length().toUInt()
} }

@ -86,6 +86,9 @@ def decompressXZ(inFile, outFile):
f2.write(file_content) f2.write(file_content)
def main(): def main():
# from volunteers
verifySingleDir(resDir, "recovery_image_from_s-trace")
verifySingleDir(resDir, "boot_img_from_gesangtome") # android 9, no ramdisk
# 5.0 # 5.0
verifySingleDir(resDir, "5.0_fugu_lrx21m") verifySingleDir(resDir, "5.0_fugu_lrx21m")
# 6.0 # 6.0
@ -104,10 +107,6 @@ def main():
verifySingleDir(resDir, "9.0.0_blueline_pq1a.181105.017.a1") verifySingleDir(resDir, "9.0.0_blueline_pq1a.181105.017.a1")
# Q preview # Q preview
verifySingleDir(resDir, "Q_preview_blueline_qpp2.190228.023") verifySingleDir(resDir, "Q_preview_blueline_qpp2.190228.023")
# from volunteers
verifySingleDir(resDir, "recovery_image_from_s-trace")
# 10 # 10
verifySingleDir(resDir, "10.0.0_coral-qq1d.200205.002") verifySingleDir(resDir, "10.0.0_coral-qq1d.200205.002")

@ -1 +1 @@
Subproject commit b38a8c9e9763aefa1584e80b866efb0173cae04b Subproject commit d8168a226d055f8372e55e3c0096d6dca70b8611
Loading…
Cancel
Save