Merge "Upgrade graphics.composer HAL from 2.1 to 2.2" into master-cuttlefish-testing
diff --git a/shared/config/fstab.dtb b/shared/config/fstab.dtb
index a601807..4920a6c 100644
--- a/shared/config/fstab.dtb
+++ b/shared/config/fstab.dtb
@@ -1,5 +1,5 @@
/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/vde /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable
+/dev/block/vdd /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable
/dev/block/zram0 none swap defaults zramsize=75%
/tmp /sdcard none defaults,bind recoveryonly
diff --git a/shared/config/fstab.initrd b/shared/config/fstab.initrd
index 08798dd..5ffe8a1 100644
--- a/shared/config/fstab.initrd
+++ b/shared/config/fstab.initrd
@@ -1,8 +1,8 @@
/dev/block/vda /system ext4 noatime,ro,errors=panic wait
/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 /vendor ext4 noatime,ro,errors=panic wait
-/dev/block/vde /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable
+/dev/block/vdd /metadata ext4 nodev,noatime,nosuid,errors=panic wait,formattable
+/dev/block/vde /vendor ext4 noatime,ro,errors=panic wait
/dev/block/vdf /product ext4 noatime,ro,errors=panic wait
/dev/block/zram0 none swap defaults zramsize=75%
/tmp /sdcard none defaults,bind recoveryonly
diff --git a/shared/config/gsi.fstab b/shared/config/gsi.fstab
index 4e3f31a..76c902b 100644
--- a/shared/config/gsi.fstab
+++ b/shared/config/gsi.fstab
@@ -1,2 +1,2 @@
-/dev/block/vdd /vendor ext4 noatime,ro,errors=panic wait
+/dev/block/vde /vendor ext4 noatime,ro,errors=panic wait
/dev/block/vdf /product ext4 noatime,ro,errors=panic wait
diff --git a/shared/config/initrd-root.dtb b/shared/config/initrd-root.dtb
index 7962e1b..d12be7e 100644
--- a/shared/config/initrd-root.dtb
+++ b/shared/config/initrd-root.dtb
Binary files differ
diff --git a/shared/config/initrd-root.dts b/shared/config/initrd-root.dts
index cb9e5ec..d27d76a 100644
--- a/shared/config/initrd-root.dts
+++ b/shared/config/initrd-root.dts
@@ -32,7 +32,7 @@
vendor {
compatible = "android,vendor";
- dev = "/dev/block/vdd";
+ dev = "/dev/block/vde";
type = "ext4";
mnt_flags = "noatime,ro,errors=panic";
fsmgr_flags = "wait";
diff --git a/shared/config/system-root.dtb b/shared/config/system-root.dtb
index bae54d8..2ebd0d7 100644
--- a/shared/config/system-root.dtb
+++ b/shared/config/system-root.dtb
Binary files differ
diff --git a/shared/config/system-root.dts b/shared/config/system-root.dts
index 327a38c..db16f37 100644
--- a/shared/config/system-root.dts
+++ b/shared/config/system-root.dts
@@ -24,7 +24,7 @@
compatible = "android,fstab";
vendor {
compatible = "android,vendor";
- dev = "/dev/block/vdd";
+ dev = "/dev/block/vde";
type = "ext4";
mnt_flags = "noatime,ro,errors=panic";
fsmgr_flags = "wait";
diff --git a/shared/sepolicy/file_contexts b/shared/sepolicy/file_contexts
index 4d1c6f7..14c2f5c 100644
--- a/shared/sepolicy/file_contexts
+++ b/shared/sepolicy/file_contexts
@@ -4,8 +4,9 @@
/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:system_block_device:s0
-/dev/block/vde u:object_r:metadata_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/zram0 u:object_r:swap_block_device:s0
/dev/dri/card0 u:object_r:graphics_device:s0
/dev/dri/renderD128 u:object_r:graphics_device:s0