Revert "gs101: Enable system_dlkm dynamic partition" am: 7bb4293087
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18513552 Change-Id: I8731cd11a37f5d5b4365bd74c630afa0855798e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
22100341b5
2 changed files with 1 additions and 9 deletions
|
@ -82,7 +82,6 @@ AB_OTA_UPDATER := true
|
|||
|
||||
AB_OTA_PARTITIONS += \
|
||||
system \
|
||||
system_dlkm \
|
||||
system_ext \
|
||||
product \
|
||||
vbmeta_system
|
||||
|
@ -133,7 +132,7 @@ $(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLO
|
|||
#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 @@ TARGET_COPY_OUT_PRODUCT := product
|
|||
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_SUPER_PARTITION_GROUPS := google_dynamic_partitions
|
|||
BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 8527020032
|
||||
BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \
|
||||
system \
|
||||
system_dlkm \
|
||||
system_ext \
|
||||
product \
|
||||
vendor \
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
#
|
||||
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
|
||||
system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
|
||||
system_dlkm /system_dlkm ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
|
||||
system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
|
||||
product /product ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128
|
||||
vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue