From cb192ee39ac25bebf0152f5e10b52b38986b2701 Mon Sep 17 00:00:00 2001
From: cfig <yuyezhong@gmail.com>
Date: Mon, 13 Mar 2023 16:33:38 +0800
Subject: [PATCH] misc improvements

* gradle pull: support devices w/o /vbmeta partition
* VendorBoot: correct size calculation
---
 README.md                                          | 2 +-
 bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt  | 2 +-
 bbootimg/src/main/kotlin/packable/BootImgParser.kt | 6 +++++-
 doc/additional_tricks.md                           | 9 +++++++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c2c2f17..db22017 100644
--- a/README.md
+++ b/README.md
@@ -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         |                         |
diff --git a/bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt b/bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt
index bbb6b97..4c06817 100644
--- a/bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt
+++ b/bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt
@@ -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()
diff --git a/bbootimg/src/main/kotlin/packable/BootImgParser.kt b/bbootimg/src/main/kotlin/packable/BootImgParser.kt
index 86fdab1..293f278 100644
--- a/bbootimg/src/main/kotlin/packable/BootImgParser.kt
+++ b/bbootimg/src/main/kotlin/packable/BootImgParser.kt
@@ -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) {
diff --git a/doc/additional_tricks.md b/doc/additional_tricks.md
index 1396650..8d9dc49 100644
--- a/doc/additional_tricks.md
+++ b/doc/additional_tricks.md
@@ -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
+```
+