Skip to content

Commit 172cbd3

Browse files
GangSecuritysysopenci
authored andcommitted
Generate boot-debug.img in non-GKI config
For Generic Kernel Image (GKI) using devices that have a vendor_boot partition, boot-debug.img mustn't be flashed, as the boot partition must be flashed with a certified GKI image. Instead vendor_boot-debug.img should be flashed onto the vendor_boot partition in order to facilitate debug ramdisk. Test Done: Boot Tracked-On: OAM-132990 Signed-off-by: Gang G Chen <gang.g.chen@intel.com>
1 parent 8ac5a92 commit 172cbd3

3 files changed

Lines changed: 15 additions & 6 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
BOARD_USES_RECOVERY_AS_BOOT := true
2+
3+
# Enable debug boot image for GSI testing
4+
# For Generic Kernel Image (GKI) using devices that have a vendor_boot partition,
5+
# boot-debug.img mustn't be flashed, as the boot partition must be flashed with
6+
# a certified GKI image. Instead vendor_boot-debug.img should be flashed
7+
# onto the vendor_boot partition in order to facilitate debug ramdisk.
8+
PRODUCT_BUILD_DEBUG_BOOT_IMAGE := true

groups/init-boot/true/BoardConfig.mk

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,10 @@ BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
2222
BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE :=
2323
BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true
2424
BOOT_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
25+
26+
# disable debug boot image for GSI testing
27+
# For Generic Kernel Image (GKI) using devices that have a vendor_boot partition,
28+
# boot-debug.img mustn't be flashed, as the boot partition must be flashed with
29+
# a certified GKI image. Instead vendor_boot-debug.img should be flashed
30+
# onto the vendor_boot partition in order to facilitate debug ramdisk.
31+
PRODUCT_BUILD_DEBUG_BOOT_IMAGE := false

groups/slot-ab/true/BoardConfig.mk

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ AB_OTA_PARTITIONS := \
66
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
77
{{/dynamic-partitions}}
88
TARGET_NO_RECOVERY := true
9-
{{^init-boot}}
10-
BOARD_USES_RECOVERY_AS_BOOT := true
11-
{{/init-boot}}
12-
{{#init-boot}}
13-
BOARD_USES_RECOVERY_AS_BOOT :=
14-
{{/init-boot}}
159

1610
BOARD_SLOT_AB_ENABLE := true
1711
BOARD_KERNEL_CMDLINE += rootfstype=ext4

0 commit comments

Comments
 (0)