diff --git a/bbootimg/build.gradle.kts b/bbootimg/build.gradle.kts
index 6d24209..c6533cd 100644
--- a/bbootimg/build.gradle.kts
+++ b/bbootimg/build.gradle.kts
@@ -15,7 +15,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
- kotlin("jvm") version "1.5.20-RC"
+ kotlin("jvm") version "1.5.30"
application
}
diff --git a/doc/misc_image_layout.md b/doc/misc_image_layout.md
index 13197f8..ca58054 100644
--- a/doc/misc_image_layout.md
+++ b/doc/misc_image_layout.md
@@ -1,29 +1,27 @@
# /misc partition layout
-| - | - | - | Offset | Size | description |
-| :---- | :------ | :---- | :---- | :---- | ----- |
-| Legacy | bootloader_message | | 0 | (2K) | |
-| | |command | | 32 |updated by linux/bootloader |
-| | |status | | 32 |deprecated |
-| | |recovery | |768 |talking channel between normal/recovery modes |
-| | |stage | | 32 |format "#/#", eg, "1/3" |
-| | |reserved | | 1184| |
-| - | - |- | - | - | - |
-| Vendor Area | vendor bootloader msg | N/A | 2K | 2K | Vendor Area |
-| | vendor bootloader msg | N/A | 4K | 12K | pure Vendor area |
-| - | - | - | - | - | - |
-| Wipe | wipe_package info | | 16K | 16K | offset 16KB, Used by uncrypt and recovery to store wipe_package for A/B devices |
-| - | - | - | - | - | - |
-| System | system_space -> 1
misc_virtual_ab_message | | | (64) | |
-| | | version | | 1 | |
-| | | magic | | 4 | |
-| | | merge_status | | 1 | |
-| | | source_slot | | 1 | |
-| | | reserved | | 57 | |
+| - | - | - | Size | description | Offset |
+| :---- | :------ | :---- | :---- | ----- | ----- |
+| Legacy | bootloader_message | | (2K) | | --> 0 |
+| | |command | 32 |updated by linux/bootloader | |
+| | |status | 32 |deprecated | |
+| | |recovery |768 |talking channel between normal/recovery modes | |
+| | |stage | 32 |format "#/#", eg, "1/3" | |
+| | |reserved | 1184| | |
+| - | - |- | - | - | |
+| Vendor Area | vendor bootloader msg | N/A | 2K | Vendor Area | -->2KB |
+| | vendor bootloader msg | N/A | 12K | pure Vendor area | -->4KB |
+| - | - | - | - | - | |
+| Wipe | wipe_package info | | 16K | offset 16KB, Used by uncrypt and recovery to store wipe_package for A/B devices | -->16KB |
+| - | - | - | - | - | |
+| System | system_space -> 1
misc_virtual_ab_message | | (64) | | -->32KB |
+| | | version | 1 | | |
+| | | magic | 4 | | |
+| | | merge_status | 1 | | |
+| | | source_slot | 1 | | |
+| | | reserved | 57 | | |
| | | | | | |
-| | | | | | |
-
-
+| | | | | | |
### vendor area implementation example from Google:
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643..ffed3a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/helper/build.gradle.kts b/helper/build.gradle.kts
index 3d70724..5a22dae 100644
--- a/helper/build.gradle.kts
+++ b/helper/build.gradle.kts
@@ -15,7 +15,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
- id("org.jetbrains.kotlin.jvm") version "1.5.20-RC"
+ id("org.jetbrains.kotlin.jvm") version "1.5.30"
`java-library`
}
diff --git a/tools/release.mk b/tools/release.mk
index 6358cb6..00d49e2 100644
--- a/tools/release.mk
+++ b/tools/release.mk
@@ -22,8 +22,8 @@ endef
define gw_win
@IF EXIST tools\\bin SET PATH=%PATH%;tools\\bin\n
-if "%1" == "check" exit 0\n
-if "%1" == "clean" exit 0\n
+@if "%1" == "check" exit 0\n
+@if "%1" == "clean" exit 0\n
@java -jar bbootimg/bbootimg.jar %*
endef
export gw gw_win