Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future
Bug: 347831320 Merged-In: I4b2a0a61ebaff5d85a4daac445d81ae3d21aa9c3 Change-Id: I25d1a1793cc9eb7df743d1e6e9bc84e5f75fbd7d
This commit is contained in:
commit
868dc34238
4 changed files with 12 additions and 11 deletions
|
@ -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
|
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -26,6 +26,7 @@ include device/google/gs-common/storage/storage.mk
|
||||||
include device/google/gs-common/thermal/dump/thermal.mk
|
include device/google/gs-common/thermal/dump/thermal.mk
|
||||||
include device/google/gs-common/thermal/thermal_hal/device.mk
|
include device/google/gs-common/thermal/thermal_hal/device.mk
|
||||||
include device/google/gs-common/performance/perf.mk
|
include device/google/gs-common/performance/perf.mk
|
||||||
|
include device/google/gs-common/power/power.mk
|
||||||
include device/google/gs-common/pixel_metrics/pixel_metrics.mk
|
include device/google/gs-common/pixel_metrics/pixel_metrics.mk
|
||||||
include device/google/gs-common/soc/freq.mk
|
include device/google/gs-common/soc/freq.mk
|
||||||
include device/google/gs-common/gps/dump/log.mk
|
include device/google/gs-common/gps/dump/log.mk
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue