commit 7bb4293087876144d5444ebd5146983399256622
author Akilesh Kailash <akailash@google.com> Fri May 20 06:22:54 2022 +0000
committer TreeHugger Robot <treehugger-gerrit@google.com> Tue May 24 18:15:49 2022 +0000
tree 2986b2cafac8d39ad80a48dda58037a8128248fc
parent b495f66b8559d36f0b500c755a952976413620d1

Revert "gs101: Enable system_dlkm dynamic partition"

This reverts commit 58893b442fe64f8061323c5b0cecb210531ed882.

Reason for revert: OTA failues observed during S -> T

Bug: 228927535
Test: Full and Incremental OTA's.
Change-Id: Iec9e15d60dab92213494c9e679de6702f8d56e37

BoardConfig-common.mk

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 1009bb4..b5843c7 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -82,7 +82,6 @@
 
 AB_OTA_PARTITIONS += \
 	system \
-	system_dlkm \
 	system_ext \
 	product \
 	vbmeta_system
@@ -133,7 +132,7 @@
 #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true
 
 # Enable chain partition for system.
-BOARD_AVB_VBMETA_SYSTEM := system system_dlkm system_ext product
+BOARD_AVB_VBMETA_SYSTEM := system system_ext product
 BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
 BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
@@ -161,11 +160,6 @@
 BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_COPY_OUT_SYSTEM_EXT := system_ext
 
-# system_dlkm.img
-BOARD_USES_SYSTEM_DLKMIMAGE := true
-BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4
-TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm
-
 ########################
 # Video Codec
 ########################
@@ -183,7 +177,6 @@
 BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 8527020032
 BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
     system \
-    system_dlkm \
     system_ext \
     product \
     vendor \