Merge cherrypicks of ['googleplex-android-review.googlesource.com/27906354', 'googleplex-android-review.googlesource.com/27956012'] into 24Q3-release.

Change-Id: Ifa6c5d849423bf2cf03ad8a3bddb1a0a3ded8a87
This commit is contained in:
Android Build Coastguard Worker 2024-07-10 05:23:53 +00:00
commit 5ac4bfe691
3 changed files with 11 additions and 11 deletions

View file

@ -6,7 +6,7 @@ service copy_efs_files_to_data /vendor/bin/copy_efs_files_to_data
oneshot oneshot
disabled disabled
on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ext4 on post-fs-data && property:ro.boot.hardware.cpu.pagesize=16384
mkdir /data/vendor/copied 0775 radio system mkdir /data/vendor/copied 0775 radio system
restorecon_recursive /data/vendor/copied restorecon_recursive /data/vendor/copied
exec_start copy_efs_files_to_data exec_start copy_efs_files_to_data
@ -15,13 +15,10 @@ on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=ex
restorecon_recursive /data/vendor/ss restorecon_recursive /data/vendor/ss
setprop ro.vendor.persist.status mounted setprop ro.vendor.persist.status mounted
on post-fs-data && property:ro.boot.flash.locked=0 && property:ro.fstype.data=f2fs on early-init && property:ro.boot.hardware.cpu.pagesize=4096
mount_all /vendor/etc/fstab.efs mount_all /vendor/etc/fstab.persist --early
mount_all /vendor/etc/fstab.persist
setprop ro.vendor.persist.status mounted setprop ro.vendor.persist.status mounted
on post-fs-data && property:ro.boot.flash.locked=1 on late-fs && property:ro.boot.hardware.cpu.pagesize=4096
mount_all /vendor/etc/fstab.efs mount_all /vendor/etc/fstab.efs --early
mount_all /vendor/etc/fstab.persist
setprop ro.vendor.persist.status mounted

View file

@ -1,4 +1,6 @@
on post-fs-data on early-init
mount_all /vendor/etc/fstab.efs mount_all /vendor/etc/fstab.persist --early
mount_all /vendor/etc/fstab.persist
setprop ro.vendor.persist.status mounted setprop ro.vendor.persist.status mounted
on late-fs
mount_all /vendor/etc/fstab.efs --early

View file

@ -31,6 +31,7 @@ on property:ro.vendor.persist.status=mounted
mkdir /mnt/vendor/persist/data/tz 0700 system system mkdir /mnt/vendor/persist/data/tz 0700 system system
mkdir /mnt/vendor/persist/touch 0770 system system mkdir /mnt/vendor/persist/touch 0770 system system
on property:ro.fstype.data=* && property:ro.vendor.persist.status=mounted
# Proxy for Secure Storage # Proxy for Secure Storage
mkdir /data/vendor/rebootescrow 0770 hsm hsm mkdir /data/vendor/rebootescrow 0770 hsm hsm
mkdir /data/vendor/ss 0770 root system mkdir /data/vendor/ss 0770 root system