Remove components that conflict with composite disk support.
This CL makes the following changes for composite disk support:
(1) Replace pre-composite-disk sepolicy with by-name symlinks.
(2) Do not explicity name the super partition "vda". This causes
conflicts with code that expects a retrofit device.
(3) Remove sepolicy that configures the super partition as a retrofit
device.
Bug: 141516138
Test: atest VendorOverlayHostTest
Change-Id: I44e83b132453d94d3663b9493995f23357a6967e
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 5bc7135..2e55920 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -146,7 +146,6 @@
BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions
BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := system vendor product system_ext
BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 6442450944
-BOARD_SUPER_PARTITION_METADATA_DEVICE := vda
BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true
BOARD_SUPER_IMAGE_IN_UPDATE_PACKAGE := true
TARGET_RELEASETOOLS_EXTENSIONS := device/google/cuttlefish/shared
diff --git a/shared/config/fstab b/shared/config/fstab
index c02b5ed..05d62f9 100644
--- a/shared/config/fstab
+++ b/shared/config/fstab
@@ -1,9 +1,9 @@
boot /boot emmc defaults recoveryonly
system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount
# Add all non-dynamic partitions except system, after this comment
-/dev/block/vdb /data ext4 nodev,noatime,nosuid,errors=panic wait,fileencryption=aes-256-xts:aes-256-cts
-/dev/block/vdc /cache ext4 nodev,noatime,nosuid,errors=panic wait
-/dev/block/vdd /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable
+/dev/block/by-name/userdata /data ext4 nodev,noatime,nosuid,errors=panic wait,fileencryption=aes-256-xts:aes-256-cts
+/dev/block/by-name/metadata /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable
+/dev/block/by-name/cache /cache ext4 nodev,noatime,nosuid,errors=panic wait
# Add all dynamic partitions except system, after this comment
vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount
product /product ext4 noatime,ro,errors=panic wait,logical,first_stage_mount
diff --git a/shared/sepolicy/vendor/device.te b/shared/sepolicy/vendor/device.te
index c29c2bf..38f0a2f 100644
--- a/shared/sepolicy/vendor/device.te
+++ b/shared/sepolicy/vendor/device.te
@@ -5,4 +5,3 @@
type region_screen_device, dev_type;
type socket_forward_device, dev_type;
type virtual_serial_device, dev_type;
-typeattribute system_block_device super_block_device_type;
diff --git a/shared/sepolicy/vendor/file_contexts b/shared/sepolicy/vendor/file_contexts
index 963ebe6..69c5ad8 100644
--- a/shared/sepolicy/vendor/file_contexts
+++ b/shared/sepolicy/vendor/file_contexts
@@ -1,24 +1,21 @@
##########################
# Devices
#
-/dev/block/vda u:object_r:system_block_device:s0
-/dev/block/vdb u:object_r:userdata_block_device:s0
-/dev/block/vdc u:object_r:cache_block_device:s0
-/dev/block/vdd u:object_r:metadata_block_device:s0
-/dev/block/vde u:object_r:system_block_device:s0
-/dev/block/vdf u:object_r:system_block_device:s0
-/dev/block/vdg u:object_r:system_block_device:s0
-/dev/block/vda1 u:object_r:system_block_device:s0
-/dev/block/vda2 u:object_r:userdata_block_device:s0
-/dev/block/vda3 u:object_r:cache_block_device:s0
-/dev/block/vda4 u:object_r:metadata_block_device:s0
-/dev/block/vda5 u:object_r:system_block_device:s0
-/dev/block/vda7 u:object_r:system_block_device:s0
# crosvm block devices
+/dev/block/pci/pci0000:00/0000:00:01\.0/by-name/boot u:object_r:boot_block_device:s0
+/dev/block/pci/pci0000:00/0000:00:01\.0/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/pci/pci0000:00/0000:00:01\.0/by-name/misc u:object_r:misc_block_device:s0
+/dev/block/pci/pci0000:00/0000:00:01\.0/by-name/super u:object_r:super_block_device:s0
+/dev/block/pci/pci0000:00/0000:00:01\.0/by-name/userdata u:object_r:userdata_block_device:s0
+/dev/block/pci/pci0000:00/0000:00:01\.0/by-name/cache u:object_r:cache_block_device:s0
# qemu block devices
+/dev/block/pci/pci0000:00/0000:00:03\.0/by-name/boot u:object_r:boot_block_device:s0
+/dev/block/pci/pci0000:00/0000:00:03\.0/by-name/metadata u:object_r:metadata_block_device:s0
/dev/block/pci/pci0000:00/0000:00:03\.0/by-name/misc u:object_r:misc_block_device:s0
+/dev/block/pci/pci0000:00/0000:00:03\.0/by-name/super u:object_r:super_block_device:s0
+/dev/block/pci/pci0000:00/0000:00:03\.0/by-name/userdata u:object_r:userdata_block_device:s0
+/dev/block/pci/pci0000:00/0000:00:03\.0/by-name/cache u:object_r:cache_block_device:s0
/dev/block/zram0 u:object_r:swap_block_device:s0
/dev/dri u:object_r:gpu_device:s0