Skip to content

Commit 62bc800

Browse files
committed
update gradle/kotlin
gradle 7.2 kotlin plugin: 1.5.30
1 parent 6c07824 commit 62bc800

File tree

5 files changed

+26
-28
lines changed

5 files changed

+26
-28
lines changed

bbootimg/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1616

1717
plugins {
18-
kotlin("jvm") version "1.5.20-RC"
18+
kotlin("jvm") version "1.5.30"
1919
application
2020
}
2121

doc/misc_image_layout.md

+21-23
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
11
# /misc partition layout
22

3-
| - | - | - | Offset | Size | description |
4-
| :---- | :------ | :---- | :---- | :---- | ----- |
5-
| Legacy | bootloader_message | | 0 | (2K) | |
6-
| | |command | | 32 |updated by linux/bootloader |
7-
| | |status | | 32 |deprecated |
8-
| | |recovery | |768 |talking channel between normal/recovery modes |
9-
| | |stage | | 32 |format "#/#", eg, "1/3" |
10-
| | |reserved | | 1184| |
11-
| - | - |- | - | - | - |
12-
| Vendor Area | vendor bootloader msg | N/A | 2K | 2K | Vendor Area |
13-
| | vendor bootloader msg | N/A | 4K | 12K | pure Vendor area |
14-
| - | - | - | - | - | - |
15-
| Wipe | wipe_package info | | 16K | 16K | offset 16KB, Used by uncrypt and recovery to store wipe_package for A/B devices |
16-
| - | - | - | - | - | - |
17-
| System | system_space -> 1<br>misc_virtual_ab_message | | | (64) | |
18-
| | | version | | 1 | |
19-
| | | magic | | 4 | |
20-
| | | merge_status | | 1 | |
21-
| | | source_slot | | 1 | |
22-
| | | reserved | | 57 | |
3+
| - | - | - | Size | description | Offset |
4+
| :---- | :------ | :---- | :---- | ----- | ----- |
5+
| Legacy | bootloader_message | | (2K) | | --> 0 |
6+
| | |command | 32 |updated by linux/bootloader | |
7+
| | |status | 32 |deprecated | |
8+
| | |recovery |768 |talking channel between normal/recovery modes | |
9+
| | |stage | 32 |format "#/#", eg, "1/3" | |
10+
| | |reserved | 1184| | |
11+
| - | - |- | - | - | |
12+
| Vendor Area | vendor bootloader msg | N/A | 2K | Vendor Area | -->2KB |
13+
| | vendor bootloader msg | N/A | 12K | pure Vendor area | -->4KB |
14+
| - | - | - | - | - | |
15+
| Wipe | wipe_package info | | 16K | offset 16KB, Used by uncrypt and recovery to store wipe_package for A/B devices | -->16KB |
16+
| - | - | - | - | - | |
17+
| System | system_space -> 1<br>misc_virtual_ab_message | | (64) | | -->32KB |
18+
| | | version | 1 | | |
19+
| | | magic | 4 | | |
20+
| | | merge_status | 1 | | |
21+
| | | source_slot | 1 | | |
22+
| | | reserved | 57 | | |
2323
| | | | | | |
24-
| | | | | | |
25-
26-
24+
| | | | | | |
2725

2826
### vendor area implementation example from Google:
2927

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

helper/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1616

1717
plugins {
18-
id("org.jetbrains.kotlin.jvm") version "1.5.20-RC"
18+
id("org.jetbrains.kotlin.jvm") version "1.5.30"
1919
`java-library`
2020
}
2121

tools/release.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ endef
2222

2323
define gw_win
2424
@IF EXIST tools\\bin SET PATH=%PATH%;tools\\bin\n
25-
if "%1" == "check" exit 0\n
26-
if "%1" == "clean" exit 0\n
25+
@if "%1" == "check" exit 0\n
26+
@if "%1" == "clean" exit 0\n
2727
@java -jar bbootimg/bbootimg.jar %*
2828
endef
2929
export gw gw_win

0 commit comments

Comments
 (0)