aiden
/
Android_boot_image_editor
mirror of https://github.com/cfig/Android_boot_image_editor
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

support lzma/xz ramdisk

Browse Source 
Issue 52
pull/53/head
cfig 4 years ago
parent 6c662a54da
commit 31be98dc60
No known key found for this signature in database
GPG Key ID: B104C307F0FDABB7
6 changed files with 133 additions and 12 deletions
Show Stats Download Patch File Download Diff File

2
bbootimg/build.gradle.kts
Unescape Escape View File

@ -31,7 +31,7 @@ dependencies {
}
application {
mainClassName = "cfig.packable.PackableLauncherKt"
mainClass.set("cfig.packable.PackableLauncherKt")
}
tasks.withType<KotlinCompile>().all {

2
bbootimg/src/main/kotlin/avb/Avb.kt
Unescape Escape View File

@ -426,7 +426,7 @@ class Avb {
}
}
} else {
log.info("no companion vbmeta.img")
log.debug("no companion vbmeta.img")
}
}
}

46
bbootimg/src/main/kotlin/bootimg/Common.kt
Unescape Escape View File

@ -123,14 +123,34 @@ class Common {
ZipHelper.isGZ(s.dumpFile) -> {
Files.move(
Paths.get(s.dumpFile), Paths.get(s.dumpFile + ".gz"),
java.nio.file.StandardCopyOption.REPLACE_EXISTING)
java.nio.file.StandardCopyOption.REPLACE_EXISTING
)
ZipHelper.zcat(s.dumpFile + ".gz", s.dumpFile)
}
ZipHelper.isXz(s.dumpFile) -> {
log.info("ramdisk is compressed xz")
Files.move(
Paths.get(s.dumpFile), Paths.get(s.dumpFile + ".xz"),
java.nio.file.StandardCopyOption.REPLACE_EXISTING
)
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(
Paths.get(s.dumpFile), Paths.get(s.dumpFile + ".lz4"),
java.nio.file.StandardCopyOption.REPLACE_EXISTING)
java.nio.file.StandardCopyOption.REPLACE_EXISTING
)
ZipHelper.lz4cat(s.dumpFile + ".lz4", s.dumpFile)
ret = "lz4"
}
@ -234,18 +254,30 @@ class Common {
//using preset fs_config
fun packRootfs(rootDir: String, ramdiskGz: String) {
log.info("Packing rootfs $rootDir ...")
val root = File(rootDir).path
log.info("Packing rootfs $root ...")
val fsConfig = File(ramdiskGz).parentFile.path + "/ramdisk_filelist.txt"
when {
ramdiskGz.endsWith(".gz") -> {
val f = ramdiskGz.removeSuffix(".gz")
AndroidCpio().pack(rootDir, f, fsConfig)
ZipHelper.minigzip(ramdiskGz, FileInputStream(f))
AndroidCpio().pack(root, f, fsConfig)
FileInputStream(f).use { ZipHelper.minigzip(ramdiskGz, it) }
}
ramdiskGz.endsWith(".lz4") -> {
val f = ramdiskGz.removeSuffix(".lz4")
AndroidCpio().pack(rootDir, f, fsConfig)
ZipHelper.lz4(ramdiskGz, FileInputStream(f))
AndroidCpio().pack(root, f, fsConfig)
FileInputStream(f).use { ZipHelper.lz4(ramdiskGz, it) }
}
ramdiskGz.endsWith(".lzma") -> {
val f = ramdiskGz.removeSuffix(".lzma")
AndroidCpio().pack(root, f, fsConfig)
FileInputStream(f).use { ZipHelper.lzma(ramdiskGz, it) }
}
ramdiskGz.endsWith(".xz") -> {
val f = ramdiskGz.removeSuffix(".xz")
AndroidCpio().pack(root, f, fsConfig)
FileInputStream(f).use { ZipHelper.xz(ramdiskGz, it) }
}
else -> {
throw IllegalArgumentException("$ramdiskGz is not supported")

4
bbootimg/src/main/resources/simplelogger.properties
Unescape Escape View File

@ -1 +1,5 @@
org.slf4j.simpleLogger.defaultLogLevel = info
org.slf4j.simpleLogger.showDateTime = true
org.slf4j.simpleLogger.dateTimeFormat = HH:mm:ss:SSS
org.slf4j.simpleLogger.showThreadName = false
org.slf4j.simpleLogger.showShortLogName = true

1
helper/build.gradle.kts
Unescape Escape View File

@ -19,6 +19,7 @@ dependencies {
implementation("org.apache.commons:commons-exec:1.3")
implementation("org.bouncycastle:bcprov-jdk15on:1.57")
implementation("org.apache.commons:commons-compress:1.20")
implementation("org.tukaani:xz:1.8")
testImplementation("org.jetbrains.kotlin:kotlin-test")
testImplementation("org.jetbrains.kotlin:kotlin-test-junit")

88
helper/src/main/kotlin/cfig/helper/ZipHelper.kt
Unescape Escape View File

@ -10,11 +10,15 @@ import org.apache.commons.compress.archivers.zip.ZipFile
import org.apache.commons.compress.archivers.zip.ZipMethod
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream
import org.apache.commons.compress.compressors.gzip.GzipParameters
import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream
import org.apache.commons.compress.compressors.lzma.LZMACompressorOutputStream
import org.apache.commons.compress.compressors.xz.XZCompressorInputStream
import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream
import org.apache.commons.exec.CommandLine
import org.apache.commons.exec.DefaultExecutor
import org.apache.commons.exec.PumpStreamHandler
import org.slf4j.LoggerFactory
import org.tukaani.xz.XZFormatException
import java.io.*
import java.lang.RuntimeException
import java.net.URI
@ -195,6 +199,52 @@ class ZipHelper {
this.closeArchiveEntry()
}
fun isLzma(compressedFile: String): Boolean {
return try {
FileInputStream(compressedFile).use { fis ->
LZMACompressorInputStream(fis).use {
}
}
true
} catch (e: IOException) {
false
}
}
fun lzma(compressedFile: String, fis: InputStream) {
log.info("Compress(lzma) ... ")
FileOutputStream(compressedFile).use { fos ->
LZMACompressorOutputStream(fos).use { gos ->
val buffer = ByteArray(1024)
while (true) {
val bytesRead = fis.read(buffer)
if (bytesRead <= 0) break
gos.write(buffer, 0, bytesRead)
}
}
}
log.info("compress(lzma) done: $compressedFile")
}
/*
@function: lzcat compressedFile > decompressedFile
*/
fun lzcat(compressedFile: String, decompressedFile: String) {
FileInputStream(compressedFile).use { fileIn ->
LZMACompressorInputStream(fileIn).use { lzmaInputStream ->
FileOutputStream(decompressedFile).use { fileOutputStream ->
val buffer = ByteArray(1024)
while (true) {
val bytesRead = lzmaInputStream.read(buffer)
if (bytesRead <= 0) break
fileOutputStream.write(buffer, 0, bytesRead)
}
}
}
}
log.info("decompress(lzma) done: $compressedFile -> $decompressedFile")
}
fun isXz(compressedFile: String): Boolean {
return try {
FileInputStream(compressedFile).use { fis ->
@ -202,11 +252,45 @@ class ZipHelper {
}
}
true
} catch (e: ZipException) {
} catch (e: XZFormatException) {
false
}
}
fun xz(compressedFile: String, fis: InputStream) {
log.info("Compress(xz) ... ")
FileOutputStream(compressedFile).use { fos ->
XZCompressorOutputStream(fos).use { gos ->
val buffer = ByteArray(1024)
while (true) {
val bytesRead = fis.read(buffer)
if (bytesRead <= 0) break
gos.write(buffer, 0, bytesRead)
}
}
}
log.info("compress(xz) done: $compressedFile")
}
/*
@function: xzcat compressedFile > decompressedFile
*/
fun xzcat(compressedFile: String, decompressedFile: String) {
FileInputStream(compressedFile).use { fileIn ->
XZCompressorInputStream(fileIn).use { zis ->
FileOutputStream(decompressedFile).use { fileOutputStream ->
val buffer = ByteArray(1024)
while (true) {
val bytesRead = zis.read(buffer)
if (bytesRead <= 0) break
fileOutputStream.write(buffer, 0, bytesRead)
}
}
}
}
log.info("decompress(xz) done: $compressedFile -> $decompressedFile")
}
fun isLz4(compressedFile: String): Boolean {
return try {
"lz4 -t $compressedFile".check_call()
@ -267,10 +351,10 @@ class ZipHelper {
if (bytesRead <= 0) break
fileOutputStream.write(buffer, 0, bytesRead)
}
log.info("decompress(gz) done: $compressedFile -> $decompressedFile")
}
}
}
log.info("decompress(gz) done: $compressedFile -> $decompressedFile")
}
/*

Write Preview
Loading…
Cancel
Save