Revert "Enable chained vbmeta for boot"
Revert "Allow init boot_block_device:lnk_file relabelto."
Revert submission 1514903-chain_vbmeta_redbull
Reason for revert: test b/174826519
Reverted Changes:
I1cae1ef76:Enable chained vbmeta for boot
I820cbaf20:Allow init boot_block_device:lnk_file relabelto.
Change-Id: I62db277a495a993f60ce1dcf9808c8e7ba43546c
(cherry picked from commit 9ae0b69cefff8f186302c9ed7b2c86545085ed74)
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index cf907e9..dcc8f41 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -102,12 +102,6 @@
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
-# Enable chained vbmeta for boot images
-BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
-BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048
-BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
-BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2
-
# product.img
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
diff --git a/fstab.hardware b/fstab.hardware
index d27d483..912363c 100644
--- a/fstab.hardware
+++ b/fstab.hardware
@@ -1,7 +1,6 @@
# Android fstab file.
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
-/dev/block/bootdevice/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount
system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount
vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount
