lzma checking may crash, move to last

pull/53/head
cfig 4 years ago
parent c46398dbb7
commit a67ff9e4db
No known key found for this signature in database
GPG Key ID: B104C307F0FDABB7

@ -136,15 +136,6 @@ class Common {
ZipHelper.xzcat(s.dumpFile + ".xz", s.dumpFile)
ret = "xz"
}
ZipHelper.isLzma(s.dumpFile) -> {
log.info("ramdisk is compressed lzma")
Files.move(
Paths.get(s.dumpFile), Paths.get(s.dumpFile + ".lzma"),
java.nio.file.StandardCopyOption.REPLACE_EXISTING
)
ZipHelper.lzcat(s.dumpFile + ".lzma", s.dumpFile)
ret = "lzma"
}
ZipHelper.isLz4(s.dumpFile) -> {
log.info("ramdisk is compressed lz4")
Files.move(
@ -154,6 +145,15 @@ class Common {
ZipHelper.lz4cat(s.dumpFile + ".lz4", s.dumpFile)
ret = "lz4"
}
ZipHelper.isLzma(s.dumpFile) -> {
log.info("ramdisk is compressed lzma")
Files.move(
Paths.get(s.dumpFile), Paths.get(s.dumpFile + ".lzma"),
java.nio.file.StandardCopyOption.REPLACE_EXISTING
)
ZipHelper.lzcat(s.dumpFile + ".lzma", s.dumpFile)
ret = "lzma"
}
else -> {
throw IllegalArgumentException("ramdisk is in unknown format")
}

@ -118,6 +118,7 @@ def main():
verifySingleDir(resDir, "recovery_image_from_s-trace")
verifySingleDir(resDir, "boot_img_from_gesangtome") # android 9, no ramdisk
verifySingleDir(resDir, "issue_47")
verifySingleDir(resDir, "issue_52")
# 5.0
verifySingleDir(resDir, "5.0_fugu_lrx21m")
# 6.0

@ -1 +1 @@
Subproject commit 35fd7989555769a3cca47537798df28fc733479f
Subproject commit 7b6f3952078e71d02a4d6ba0cf02cfdd1b4d9b7d
Loading…
Cancel
Save