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

vendor boot update for abe

Browse Source
dev
cfig 9 months ago
parent 67cdef2c43
commit 38dd70a5fd
7 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File

5
README.md
Unescape Escape View File

@ -362,8 +362,3 @@ https://developers.google.cn/android/images<br/>
</details> </details>
This project is developed with products by Jetbrains.
<a href="https://jb.gg/OpenSource">
<img src="https://user-images.githubusercontent.com/1133314/116802621-c076be80-ab46-11eb-8a14-9454a933de7d.png" alt="drawing" width="80">
</a>

63
bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt
Unescape Escape View File

@ -67,7 +67,8 @@ data class VendorBoot(
) )
data class MiscInfo( data class MiscInfo(
var output: String = "", var input: String = "",
var role: String = "",
var json: String = "", var json: String = "",
var headerVersion: Int = 0, var headerVersion: Int = 0,
var product: String = "", var product: String = "",
@ -182,7 +183,8 @@ data class VendorBoot(
val ret = VendorBoot() val ret = VendorBoot()
FileInputStream(fileName).use { fis -> FileInputStream(fileName).use { fis ->
val header = VendorBootHeader(fis) val header = VendorBootHeader(fis)
ret.info.output = File(fileName).name ret.info.input = File(fileName).canonicalPath
ret.info.role = File(fileName).name
ret.info.json = File(fileName).name.removeSuffix(".img") + ".json" ret.info.json = File(fileName).name.removeSuffix(".img") + ".json"
ret.info.headerSize = header.headerSize ret.info.headerSize = header.headerSize
ret.info.product = header.product ret.info.product = header.product
@ -192,14 +194,14 @@ data class VendorBoot(
ret.info.pageSize = header.pageSize ret.info.pageSize = header.pageSize
ret.info.headerVersion = header.headerVersion ret.info.headerVersion = header.headerVersion
//ramdisk //ramdisk
ret.ramdisk.file = workDir + "ramdisk.img" ret.ramdisk.file = Helper.joinPath(workDir!!, "ramdisk.img")
ret.ramdisk.size = header.vndRamdiskTotalSize ret.ramdisk.size = header.vndRamdiskTotalSize
ret.ramdisk.loadAddr = header.ramdiskLoadAddr ret.ramdisk.loadAddr = header.ramdiskLoadAddr
ret.ramdisk.position = Helper.round_to_multiple( ret.ramdisk.position = Helper.round_to_multiple(
VendorBootHeader.VENDOR_BOOT_IMAGE_HEADER_V3_SIZE, header.pageSize VendorBootHeader.VENDOR_BOOT_IMAGE_HEADER_V3_SIZE, header.pageSize
).toLong() ).toLong()
//dtb //dtb
ret.dtb.file = workDir + "dtb" ret.dtb.file = Helper.joinPath(workDir, "dtb")
ret.dtb.size = header.dtbSize ret.dtb.size = header.dtbSize
ret.dtb.loadAddr = header.dtbLoadAddr ret.dtb.loadAddr = header.dtbLoadAddr
ret.dtb.position = ret.ramdisk.position + Helper.round_to_multiple(ret.ramdisk.size, header.pageSize) ret.dtb.position = ret.ramdisk.position + Helper.round_to_multiple(ret.ramdisk.size, header.pageSize)
@ -209,10 +211,10 @@ data class VendorBoot(
ret.ramdisk_table.eachEntrySize = header.vrtEntrySize ret.ramdisk_table.eachEntrySize = header.vrtEntrySize
ret.ramdisk_table.position = ret.ramdisk_table.position =
ret.dtb.position + Helper.round_to_multiple(ret.dtb.size, header.pageSize) ret.dtb.position + Helper.round_to_multiple(ret.dtb.size, header.pageSize)
FileInputStream(ret.info.output).use { FileInputStream(ret.info.input).use {
it.skip(ret.ramdisk_table.position) it.skip(ret.ramdisk_table.position)
for (item in 0 until header.vrtEntryNum) { for (item in 0 until header.vrtEntryNum) {
ret.ramdisk_table.ramdidks.add(VrtEntry(it, workDir + "ramdisk.${item + 1}")) ret.ramdisk_table.ramdidks.add(VrtEntry(it, Helper.joinPath(workDir, "ramdisk.${item + 1}")))
} }
} }
ret.ramdisk_table.ramdidks.forEach { ret.ramdisk_table.ramdidks.forEach {
@ -221,7 +223,7 @@ data class VendorBoot(
} }
//bootconfig //bootconfig
if (header.bootconfigSize > 0) { if (header.bootconfigSize > 0) {
ret.bootconfig.file = workDir + "bootconfig" ret.bootconfig.file = Helper.joinPath(workDir, "bootconfig")
ret.bootconfig.size = header.bootconfigSize ret.bootconfig.size = header.bootconfigSize
ret.bootconfig.position = ret.bootconfig.position =
ret.ramdisk_table.position + Helper.round_to_multiple(ret.ramdisk_table.size, header.pageSize) ret.ramdisk_table.position + Helper.round_to_multiple(ret.ramdisk_table.size, header.pageSize)
@ -235,7 +237,7 @@ data class VendorBoot(
fun pack(): VendorBoot { fun pack(): VendorBoot {
when (this.info.headerVersion) { when (this.info.headerVersion) {
3 -> { 3 -> {
if (File(workDir + this.ramdisk.file).exists() && !File(workDir + "root").exists()) { if (File(workDir, this.ramdisk.file).exists() && !File(workDir, "root").exists()) {
//do nothing if we have ramdisk.img.gz but no /root //do nothing if we have ramdisk.img.gz but no /root
log.warn("Use prebuilt ramdisk file: ${this.ramdisk.file}") log.warn("Use prebuilt ramdisk file: ${this.ramdisk.file}")
} else { } else {
@ -251,8 +253,8 @@ data class VendorBoot(
else -> { else -> {
this.ramdisk_table.ramdidks.forEachIndexed { index, it -> this.ramdisk_table.ramdidks.forEachIndexed { index, it ->
File(it.file).deleleIfExists() File(it.file).deleleIfExists()
log.info(workDir + "root.${index + 1} -> " + it.file) log.info(Helper.joinPath(workDir!!, "/root.${index + 1}") + " -> " + it.file)
C.packRootfs(workDir + "root.${index + 1}", it.file, this.ramdisk.xzFlags) C.packRootfs(Helper.joinPath(workDir, "root.${index + 1}"), it.file, this.ramdisk.xzFlags)
} }
this.ramdisk.size = this.ramdisk_table.ramdidks.sumOf { File(it.file).length() }.toInt() this.ramdisk.size = this.ramdisk_table.ramdidks.sumOf { File(it.file).length() }.toInt()
} }
@ -263,7 +265,7 @@ data class VendorBoot(
} }
this.dtb.size = File(this.dtb.file).length().toInt() this.dtb.size = File(this.dtb.file).length().toInt()
//header //header
FileOutputStream(this.info.output + ".clear", false).use { fos -> FileOutputStream(this.info.role + ".clear", false).use { fos ->
val encodedHeader = this.toHeader().encode() val encodedHeader = this.toHeader().encode()
fos.write(encodedHeader) fos.write(encodedHeader)
fos.write(ByteArray(Helper.round_to_multiple(encodedHeader.size, this.info.pageSize) - encodedHeader.size)) fos.write(ByteArray(Helper.round_to_multiple(encodedHeader.size, this.info.pageSize) - encodedHeader.size))
@ -301,34 +303,34 @@ data class VendorBoot(
} }
} }
//write //write
FileOutputStream("${this.info.output}.clear", true).use { fos -> FileOutputStream("${this.info.role}.clear", true).use { fos ->
fos.write(bf.array(), 0, bf.position()) fos.write(bf.array(), 0, bf.position())
} }
//google way //google way
this.toCommandLine().addArgument(this.info.output + ".google").let { this.toCommandLine().addArgument(this.info.role + ".google").let {
log.info(it.toString()) log.info(it.toString())
DefaultExecutor().execute(it) DefaultExecutor().execute(it)
} }
Helper.assertFileEquals(this.info.output + ".clear", this.info.output + ".google") Helper.assertFileEquals(this.info.role + ".clear", this.info.role + ".google")
return this return this
} }
fun sign(): VendorBoot { fun sign(): VendorBoot {
val avbtool = String.format(Helper.prop("avbtool")!!, "v1.2") val avbtool = String.format(Helper.prop("avbtool")!!, "v1.2")
File(Avb.getJsonFileName(info.output)).let { File(Avb.getJsonFileName(info.role)).let {
if (it.exists()) { if (it.exists()) {
Signer.signAVB(info.output, this.info.imageSize, avbtool) Signer.signAVB(info.role, this.info.imageSize, avbtool)
} else { } else {
log.warn("skip signing of ${info.output}") log.warn("skip signing of ${info.role}")
} }
} }
return this return this
} }
fun updateVbmeta(): VendorBoot { fun updateVbmeta(): VendorBoot {
Avb.updateVbmeta(info.output) Avb.updateVbmeta(info.role)
return this return this
} }
@ -354,11 +356,11 @@ data class VendorBoot(
fun extractImages(): VendorBoot { fun extractImages(): VendorBoot {
//header //header
ObjectMapper().writerWithDefaultPrettyPrinter().writeValue(File(workDir + this.info.json), this) ObjectMapper().writerWithDefaultPrettyPrinter().writeValue(File(workDir, this.info.json), this)
//ramdisk //ramdisk
//@formatter:off //@formatter:off
val fmt = C.dumpRamdisk( val fmt = C.dumpRamdisk(
Helper.Slice(info.output, ramdisk.position.toInt(), ramdisk.size, ramdisk.file), File(workDir, "root").path, Helper.Slice(info.input, ramdisk.position.toInt(), ramdisk.size, ramdisk.file), File(workDir, "root").path,
this.ramdisk_table.ramdidks.isEmpty()) this.ramdisk_table.ramdidks.isEmpty())
//@formatter:on //@formatter:on
this.ramdisk.file = this.ramdisk.file + ".$fmt" this.ramdisk.file = this.ramdisk.file + ".$fmt"
@ -368,7 +370,7 @@ data class VendorBoot(
} }
//dtb //dtb
run { run {
C.dumpDtb(Helper.Slice(info.output, dtb.position.toInt(), dtb.size, dtb.file), false) C.dumpDtb(Helper.Slice(info.input, dtb.position.toInt(), dtb.size, dtb.file), false)
if (dtb.size > 0) { if (dtb.size > 0) {
dtb.dtbList = DTC.parseMultiple(dtb.file) dtb.dtbList = DTC.parseMultiple(dtb.file)
DTC.extractMultiple(dtb.file, dtb.dtbList) DTC.extractMultiple(dtb.file, dtb.dtbList)
@ -378,23 +380,23 @@ data class VendorBoot(
this.ramdisk_table.ramdidks.forEachIndexed { index, it -> this.ramdisk_table.ramdidks.forEachIndexed { index, it ->
log.info("dumping vendor ramdisk ${index + 1}/${this.ramdisk_table.ramdidks.size} ...") log.info("dumping vendor ramdisk ${index + 1}/${this.ramdisk_table.ramdidks.size} ...")
val s = Helper.Slice(ramdisk.file, it.offset, it.size, it.file) val s = Helper.Slice(ramdisk.file, it.offset, it.size, it.file)
C.dumpRamdisk(s, workDir + "root.${index + 1}") C.dumpRamdisk(s, File(workDir, "root.${index + 1}").toString())
it.file = it.file + ".$fmt" it.file = it.file + ".$fmt"
} }
//bootconfig //bootconfig
if (bootconfig.size > 0) { if (bootconfig.size > 0) {
Helper.Slice(info.output, bootconfig.position.toInt(), bootconfig.size, bootconfig.file).let { s -> Helper.Slice(info.input, bootconfig.position.toInt(), bootconfig.size, bootconfig.file).let { s ->
Helper.extractFile(s.srcFile, s.dumpFile, s.offset.toLong(), s.length) Helper.extractFile(s.srcFile, s.dumpFile, s.offset.toLong(), s.length)
} }
} }
//dump info again //dump info again
ObjectMapper().writerWithDefaultPrettyPrinter().writeValue(File(workDir + this.info.json), this) ObjectMapper().writerWithDefaultPrettyPrinter().writeValue(File(File(workDir, this.info.json).toString()), this)
return this return this
} }
fun extractVBMeta(): VendorBoot { fun extractVBMeta(): VendorBoot {
try { try {
AVBInfo.parseFrom(Dumpling(info.output)).dumpDefault(info.output) AVBInfo.parseFrom(Dumpling(info.input)).dumpDefault(info.role)
} catch (e: Exception) { } catch (e: Exception) {
log.error("extraceVBMeta(): $e") log.error("extraceVBMeta(): $e")
} }
@ -414,8 +416,9 @@ data class VendorBoot(
} }
val tab = AsciiTable().let { val tab = AsciiTable().let {
it.addRule() it.addRule()
it.addRow("image info", workDir + info.output.removeSuffix(".img") + ".json") val imageInfoJsonFile = Helper.joinPath(workDir!!, info.role.removeSuffix(".img"), ".json")
prints.add(Pair("image info", workDir + info.output.removeSuffix(".img") + ".json")) it.addRow("image info", imageInfoJsonFile)
prints.add(Pair("image info", imageInfoJsonFile))
it.addRule() it.addRule()
it.addRow("ramdisk", this.ramdisk.file) it.addRow("ramdisk", this.ramdisk.file)
prints.add(Pair("ramdisk", this.ramdisk.file)) prints.add(Pair("ramdisk", this.ramdisk.file))
@ -452,7 +455,7 @@ data class VendorBoot(
prints.add(Pair("bootconfig", this.bootconfig.file)) prints.add(Pair("bootconfig", this.bootconfig.file))
} }
it.addRule() it.addRule()
Avb.getJsonFileName(info.output).let { jsonFile -> Avb.getJsonFileName(info.role).let { jsonFile ->
if (File(jsonFile).exists()) { if (File(jsonFile).exists()) {
it.addRow("AVB info", jsonFile) it.addRow("AVB info", jsonFile)
prints.add(Pair("AVB info", jsonFile)) prints.add(Pair("AVB info", jsonFile))
@ -483,14 +486,14 @@ data class VendorBoot(
log.info("\n" + Common.table2String(prints)) log.info("\n" + Common.table2String(prints))
} else { } else {
//@formatter:off //@formatter:off
log.info("\n\t\t\tUnpack Summary of ${info.output}\n{}\n{}{}", tableHeader.render(), tab.render(), tabVBMeta) log.info("\n\t\t\tUnpack Summary of ${info.role}\n{}\n{}{}", tableHeader.render(), tab.render(), tabVBMeta)
//@formatter:on //@formatter:on
} }
return this return this
} }
fun printPackSummary(): VendorBoot { fun printPackSummary(): VendorBoot {
Common.printPackSummary(info.output) Common.printPackSummary(info.role)
return this return this
} }

6
bbootimg/src/main/kotlin/packable/BootImgParser.kt
Unescape Escape View File

@ -143,7 +143,7 @@ class BootImgParser : IPackable {
packInternal(fileName, outDir, fileName) packInternal(fileName, outDir, fileName)
} }
override fun flash(fileName: String, deviceName: String) { fun flash(fileName: String) {
val stem = fileName.substring(0, fileName.indexOf(".")) val stem = fileName.substring(0, fileName.indexOf("."))
super.flash("$fileName.signed", stem) super.flash("$fileName.signed", stem)
@ -175,8 +175,8 @@ class BootImgParser : IPackable {
super.`@verify`(fileName) super.`@verify`(fileName)
} }
override fun pull(fileName: String, deviceName: String) { fun pull(fileName: String) {
super.pull(fileName, deviceName) super.pull(fileName, File(fileName).nameWithoutExtension)
try { try {
super.pull("vbmeta.img", "vbmeta") super.pull("vbmeta.img", "vbmeta")
} catch (e: Exception) { } catch (e: Exception) {

4
bbootimg/src/main/kotlin/packable/VBMetaParser.kt
Unescape Escape View File

@ -60,8 +60,8 @@ class VBMetaParser : IPackable {
super.`@verify`(fileName) super.`@verify`(fileName)
} }
override fun pull(fileName: String, deviceName: String) { fun pull(fileName: String) {
super.pull(fileName, deviceName) super.pull(fileName, File(fileName).nameWithoutExtension)
} }
fun clear(fileName: String) { fun clear(fileName: String) {

19
bbootimg/src/main/kotlin/packable/VendorBootParser.kt
Unescape Escape View File

@ -15,6 +15,7 @@
package cfig.packable package cfig.packable
import cfig.bootimg.v3.VendorBoot import cfig.bootimg.v3.VendorBoot
import cfig.helper.Helper
import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.databind.ObjectMapper
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import java.io.File import java.io.File
@ -38,6 +39,18 @@ class VendorBootParser : IPackable {
log.debug(vb.toString()) log.debug(vb.toString())
} }
fun unpackInternal(targetFile: String, fileName: String, unpackDir: String) {
log.info("unpackInternal(fileName: $fileName, unpackDir: $unpackDir)")
Helper.setProp("workDir", unpackDir)
clear()
val vb = VendorBoot
.parse(fileName)
.extractImages()
.extractVBMeta()
.printUnpackSummary()
log.debug(vb.toString())
}
override fun pack(fileName: String) { override fun pack(fileName: String) {
val cfgFile = "$outDir/${fileName.removeSuffix(".img")}.json" val cfgFile = "$outDir/${fileName.removeSuffix(".img")}.json"
log.info("Loading config from $cfgFile") log.info("Loading config from $cfgFile")
@ -52,8 +65,8 @@ class VendorBootParser : IPackable {
super.`@verify`(fileName) super.`@verify`(fileName)
} }
override fun pull(fileName: String, deviceName: String) { fun pull(fileName: String) {
super.pull(fileName, deviceName) super.pull(fileName, File(fileName).nameWithoutExtension)
super.pull("vbmeta.img", "vbmeta") super.pull("vbmeta.img", "vbmeta")
} }
@ -65,7 +78,7 @@ class VendorBootParser : IPackable {
VBMetaParser().clear("vbmeta.img") VBMetaParser().clear("vbmeta.img")
} }
override fun flash(fileName: String, deviceName: String) { fun flash(fileName: String) {
val stem = fileName.substring(0, fileName.indexOf(".")) val stem = fileName.substring(0, fileName.indexOf("."))
super.flash("$fileName.signed", stem) super.flash("$fileName.signed", stem)

BIN
lazybox/tools/lazybox
View File

Binary file not shown.

10
tools/factory_image_parser.py
Unescape Escape View File

@ -32,7 +32,6 @@ known_list = [
"system_ext.img", "system_ext.img",
"system.img", "system.img",
"system_other.img", "system_other.img",
"userdata.img",
"vbmeta.img", "vbmeta.img",
"vbmeta_system.img", "vbmeta_system.img",
"vbmeta_vendor.img", "vbmeta_vendor.img",
@ -43,20 +42,21 @@ known_list = [
] ]
unknown_list = [ unknown_list = [
"cmnlib.img", #Pixel3
"abl.img", #Pixel3 "abl.img", #Pixel3
"aop.img", #Pixel3 "aop.img", #Pixel3
"cmnlib64.img", #Pixel3 "cmnlib64.img", #Pixel3
"cmnlib.img", #Pixel3
"devcfg.img", #Pixel3 "devcfg.img", #Pixel3
"hyp.img", #Pixel3 "hyp.img", #Pixel3
"keymaster.img", #Pixel3 "keymaster.img", #Pixel3
"modem.img", #Pixel3 "modem.img", #Pixel3
"pvmfw.img", #Pixel7
"qupfw.img", #Pixel3 "qupfw.img", #Pixel3
"super_empty.img",
"tz.img", #Pixel3 "tz.img", #Pixel3
"xbl.img", #Pixel3 "userdata.img",
"xbl_config.img", #Pixel3 "xbl_config.img", #Pixel3
"pvmfw.img", #Pixel7 "xbl.img", #Pixel3
"super_empty.img"
] ]
tmp2 = "tmp2" tmp2 = "tmp2"

Write Preview
Loading…
Cancel
Save