fix packing problem with latest vendor_kernel_boot.img

Fix: Issue #175

>>> import java.io.File
>>> println(File("").length())
4096
master
cfig 3 months ago
parent ae4b54b143
commit f06daa3d0e
No known key found for this signature in database
GPG Key ID: B104C307F0FDABB7

@ -1,4 +1,4 @@
// Copyright 2020-2025 yuyezhong@gmail.com // Copyright 2020-2026 yuyezhong@gmail.com
// //
// Licensed under the Apache License, Version 2.0 (the "License"); // Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License. // you may not use this file except in compliance with the License.
@ -370,7 +370,7 @@ data class VendorBoot(
vrtSize = ramdisk_table.eachEntrySize * ramdisk_table.ramdidks.size, vrtSize = ramdisk_table.eachEntrySize * ramdisk_table.ramdidks.size,
vrtEntryNum = ramdisk_table.ramdidks.size, vrtEntryNum = ramdisk_table.ramdidks.size,
vrtEntrySize = ramdisk_table.eachEntrySize, vrtEntrySize = ramdisk_table.eachEntrySize,
bootconfigSize = File(bootconfig.file).length().toInt() bootconfigSize = if (bootconfig.file.isNotBlank()) File(bootconfig.file).length().toInt() else 0
).feature67() ).feature67()
} }

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

@ -197,6 +197,8 @@ def main():
log.info("sparse image is not supported on OS other than Linux, skip testing") log.info("sparse image is not supported on OS other than Linux, skip testing")
# Issue 134: multiple DTs # Issue 134: multiple DTs
verifySingleDir(resDir3, "issue_134_multiple_DTs") verifySingleDir(resDir3, "issue_134_multiple_DTs")
# Issue 175: GKI vendor_kernel_boot
verifySingleDir(resDir3, "issue_175_no_bootconfig_in_vkb")
# legacy OTA support # legacy OTA support
verifySingleDir(resDir3, "legacy_OTA") verifySingleDir(resDir3, "legacy_OTA")

@ -1 +1 @@
Subproject commit b1bff460f66fb916e30a0f7ca0b93bc922412b53 Subproject commit ee345d36b319af827f729ec790f91670007e914e
Loading…
Cancel
Save