misc improvements

* gradle pull: support devices w/o /vbmeta partition
* VendorBoot: correct size calculation
pull/140/head
cfig 2 years ago
parent 8be3510b67
commit cb192ee39a
No known key found for this signature in database
GPG Key ID: B104C307F0FDABB7

@ -55,7 +55,7 @@ Well done you did it! The last step is to star this repo :smile
| Image Type | file names | platforms | note |
| --------------- | ----------------------------------- |-------------|-------------------------|
| boot | boot.img, init_boot.img | all | |
| boot | boot.img, init_boot.img, boot(-debug|-test-harness).img | all | |
|vendor boot | vendor_boot.img, vendor_boot-debug.img, vendor_kernel_boot.img | all | |
| recovery | recovery.img, recovery-two-step.img | all | |
| vbmeta | vbmeta.img, vbmeta_system.img etc. | all | |

@ -207,7 +207,7 @@ data class VendorBoot(
ret.bootconfig.file = workDir + "bootconfig"
ret.bootconfig.size = header.bootconfigSize
ret.bootconfig.position =
ret.ramdisk_table.position + Helper.round_to_multiple(ret.bootconfig.size, header.pageSize)
ret.ramdisk_table.position + Helper.round_to_multiple(ret.ramdisk_table.size, header.pageSize)
}
}
ret.info.imageSize = File(fileName).length()

@ -131,7 +131,11 @@ class BootImgParser : IPackable {
override fun pull(fileName: String, deviceName: String) {
super.pull(fileName, deviceName)
super.pull("vbmeta.img", "vbmeta")
try {
super.pull("vbmeta.img", "vbmeta")
} catch (e: Exception) {
log.warn("can not pull vbmeta.img")
}
}
fun clear(fileName: String) {

@ -95,3 +95,12 @@ https://cateee.net/lkddb/web-lkddb/BOOT_CONFIG.html
VTS requirement:
if (S-launched, Kernel 5.10+), no "androidboot." should be placed in kernel commandline.
## vendor_boot.img vs vendor_boot-debug.img
vendor_boot-debug.img has 3 additional files:
```
adb_debug.prop
force_debuggable
userdebug_plat_sepolicy.cil
```

Loading…
Cancel
Save