Snap for 11753769 from 6e58e58324
to 24Q3-release
Change-Id: I7b5e449ddd14b5ab65e353ecbfba9cadc53c7141
This commit is contained in:
commit
7cd10f70c5
5 changed files with 56 additions and 44 deletions
6
conf/fstab.efs
Normal file
6
conf/fstab.efs
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
# Android fstab file.
|
||||||
|
# <src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
|
||||||
|
# Create the specific fstab file for efs partitions for flexibility
|
||||||
|
/dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable
|
||||||
|
/dev/block/platform/13200000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable
|
||||||
|
/dev/block/platform/13200000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable
|
|
@ -14,9 +14,6 @@ vendor /vendor
|
||||||
vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount
|
vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount
|
||||||
/dev/block/platform/13200000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount
|
/dev/block/platform/13200000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount
|
||||||
/dev/block/platform/13200000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount
|
/dev/block/platform/13200000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount
|
||||||
/dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable
|
|
||||||
/dev/block/platform/13200000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable
|
|
||||||
/dev/block/platform/13200000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable
|
|
||||||
/dev/block/platform/13200000.ufs/by-name/misc /misc emmc defaults wait
|
/dev/block/platform/13200000.ufs/by-name/misc /misc emmc defaults wait
|
||||||
/dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount
|
/dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount
|
||||||
#/dev/block/platform/13200000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount
|
#/dev/block/platform/13200000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount
|
||||||
|
|
43
conf/init.efs.rc
Normal file
43
conf/init.efs.rc
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
on property:ro.vendor.persist.status=mounted
|
||||||
|
# for battery defender
|
||||||
|
mkdir /mnt/vendor/persist/battery 0700 system system
|
||||||
|
|
||||||
|
# Factory calibration files
|
||||||
|
chmod 0771 /mnt/vendor/persist/camera
|
||||||
|
chmod 0771 /mnt/vendor/persist/camera/OTP_calibration
|
||||||
|
chmod 0771 /mnt/vendor/persist/camera/pdaf_calibration_data
|
||||||
|
mkdir /mnt/vendor/persist/camera/rear 0771 system camera
|
||||||
|
chmod 0771 /mnt/vendor/persist/camera/rear
|
||||||
|
|
||||||
|
restorecon_recursive /mnt/vendor/persist
|
||||||
|
restorecon_recursive /mnt/vendor/persist/aoc
|
||||||
|
restorecon_recursive /mnt/vendor/persist/audio
|
||||||
|
restorecon_recursive /mnt/vendor/persist/sensors
|
||||||
|
restorecon_recursive /mnt/vendor/persist/battery
|
||||||
|
restorecon_recursive /mnt/vendor/persist/camera
|
||||||
|
restorecon_recursive /mnt/vendor/persist/modem
|
||||||
|
# Set up display-related directories and permissions
|
||||||
|
# Add restorecon_recursive command to make sure the restorecon label is persist_display_file.
|
||||||
|
restorecon_recursive /mnt/vendor/persist/display
|
||||||
|
mkdir /mnt/vendor/persist/data/sfs 0700 system system
|
||||||
|
mkdir /mnt/vendor/persist/data/tz 0700 system system
|
||||||
|
mkdir /mnt/vendor/persist/touch 0770 system system
|
||||||
|
|
||||||
|
# Proxy for Secure Storage
|
||||||
|
mkdir /data/vendor/rebootescrow 0770 hsm hsm
|
||||||
|
mkdir /data/vendor/ss 0770 root system
|
||||||
|
mkdir /mnt/vendor/persist/ss 0770 root system
|
||||||
|
restorecon_recursive /mnt/vendor/persist/ss
|
||||||
|
symlink /mnt/vendor/persist/ss /data/vendor/ss/persist
|
||||||
|
chown root system /data/vendor/ss/persist
|
||||||
|
chmod 0770 /data/vendor/ss/persist
|
||||||
|
symlink /dev/block/platform/13200000\.ufs/by-name/trusty_persist /data/vendor/ss/persist/0
|
||||||
|
chown system system /data/vendor/ss/persist/0
|
||||||
|
chown system system /data/vendor/ss/persist/nsp
|
||||||
|
|
||||||
|
restart storageproxyd
|
||||||
|
|
||||||
|
on post-fs-data
|
||||||
|
mount_all /vendor/etc/fstab.efs
|
||||||
|
mount_all /vendor/etc/fstab.persist
|
||||||
|
setprop ro.vendor.persist.status mounted
|
|
@ -1,9 +1,9 @@
|
||||||
import /vendor/etc/init/hw/init.zuma.usb.rc
|
import /vendor/etc/init/hw/init.zuma.usb.rc
|
||||||
|
import /vendor/etc/init/hw/init.efs.rc
|
||||||
import android.hardware.drm@1.2-service.widevine.rc
|
import android.hardware.drm@1.2-service.widevine.rc
|
||||||
import init.exynos.sensorhub.rc
|
import init.exynos.sensorhub.rc
|
||||||
|
|
||||||
on early-init
|
on early-init
|
||||||
mount_all /vendor/etc/fstab.persist --early
|
|
||||||
write /proc/sys/kernel/sched_pelt_multiplier 1
|
write /proc/sys/kernel/sched_pelt_multiplier 1
|
||||||
write /sys/kernel/mm/lru_gen/enabled n
|
write /sys/kernel/mm/lru_gen/enabled n
|
||||||
|
|
||||||
|
@ -440,13 +440,6 @@ on post-fs-data
|
||||||
chown system system /dev/ispolin_ranging
|
chown system system /dev/ispolin_ranging
|
||||||
chmod 0660 /dev/ispolin_ranging
|
chmod 0660 /dev/ispolin_ranging
|
||||||
|
|
||||||
# Factory calibration files
|
|
||||||
chmod 0771 /mnt/vendor/persist/camera
|
|
||||||
chmod 0771 /mnt/vendor/persist/camera/OTP_calibration
|
|
||||||
chmod 0771 /mnt/vendor/persist/camera/pdaf_calibration_data
|
|
||||||
mkdir /mnt/vendor/persist/camera/rear 0771 system camera
|
|
||||||
chmod 0771 /mnt/vendor/persist/camera/rear
|
|
||||||
|
|
||||||
# Audio dump and debug
|
# Audio dump and debug
|
||||||
mkdir /data/vendor/audio 0770 audio audio
|
mkdir /data/vendor/audio 0770 audio audio
|
||||||
|
|
||||||
|
@ -619,23 +612,6 @@ on fs
|
||||||
mount_all /vendor/etc/fstab.modem --early
|
mount_all /vendor/etc/fstab.modem --early
|
||||||
restorecon_recursive /mnt/vendor/modem_img
|
restorecon_recursive /mnt/vendor/modem_img
|
||||||
|
|
||||||
# for battery defender
|
|
||||||
mkdir /mnt/vendor/persist/battery 0700 system system
|
|
||||||
|
|
||||||
restorecon_recursive /mnt/vendor/persist
|
|
||||||
restorecon_recursive /mnt/vendor/persist/aoc
|
|
||||||
restorecon_recursive /mnt/vendor/persist/audio
|
|
||||||
restorecon_recursive /mnt/vendor/persist/sensors
|
|
||||||
restorecon_recursive /mnt/vendor/persist/battery
|
|
||||||
restorecon_recursive /mnt/vendor/persist/camera
|
|
||||||
restorecon_recursive /mnt/vendor/persist/modem
|
|
||||||
# Set up display-related directories and permissions
|
|
||||||
# Add restorecon_recursive command to make sure the restorecon label is persist_display_file.
|
|
||||||
restorecon_recursive /mnt/vendor/persist/display
|
|
||||||
mkdir /mnt/vendor/persist/data/sfs 0700 system system
|
|
||||||
mkdir /mnt/vendor/persist/data/tz 0700 system system
|
|
||||||
mkdir /mnt/vendor/persist/touch 0770 system system
|
|
||||||
|
|
||||||
# Permissions for ION
|
# Permissions for ION
|
||||||
chmod 0660 /sys/class/ion_cma/ion_video_ext/isolated
|
chmod 0660 /sys/class/ion_cma/ion_video_ext/isolated
|
||||||
chown system system /sys/class/ion_cma/ion_video_ext/isolated
|
chown system system /sys/class/ion_cma/ion_video_ext/isolated
|
||||||
|
@ -934,20 +910,6 @@ service bugreport /system/bin/dumpstate -d -p -z
|
||||||
oneshot
|
oneshot
|
||||||
keycodes 114 115 116
|
keycodes 114 115 116
|
||||||
|
|
||||||
# Proxy for Secure Storage
|
|
||||||
on post-fs-data
|
|
||||||
mkdir /data/vendor/rebootescrow 0770 hsm hsm
|
|
||||||
mkdir /data/vendor/ss 0770 root system
|
|
||||||
mkdir /mnt/vendor/persist/ss 0770 root system
|
|
||||||
restorecon_recursive /mnt/vendor/persist/ss
|
|
||||||
symlink /mnt/vendor/persist/ss /data/vendor/ss/persist
|
|
||||||
chown root system /data/vendor/ss/persist
|
|
||||||
chmod 0770 /data/vendor/ss/persist
|
|
||||||
symlink /dev/block/platform/13200000\.ufs/by-name/trusty_persist /data/vendor/ss/persist/0
|
|
||||||
chown system system /data/vendor/ss/persist/0
|
|
||||||
chown system system /data/vendor/ss/persist/nsp
|
|
||||||
|
|
||||||
restart storageproxyd
|
|
||||||
|
|
||||||
service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 \
|
service storageproxyd /vendor/bin/storageproxyd -d /dev/trusty-ipc-dev0 \
|
||||||
-r /dev/sg1 -p /data/vendor/ss -t ufs
|
-r /dev/sg1 -p /data/vendor/ss -t ufs
|
||||||
|
|
|
@ -356,7 +356,8 @@ PRODUCT_COPY_FILES += \
|
||||||
device/google/zuma/conf/ueventd.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
|
device/google/zuma/conf/ueventd.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/zuma/conf/init.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.rc
|
device/google/zuma/conf/init.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.rc \
|
||||||
|
device/google/zuma/conf/init.efs.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.efs.rc
|
||||||
|
|
||||||
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
@ -378,7 +379,8 @@ PRODUCT_PACKAGES += \
|
||||||
|
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \
|
device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \
|
||||||
device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem
|
device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem \
|
||||||
|
device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.efs:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs
|
||||||
|
|
||||||
# Shell scripts
|
# Shell scripts
|
||||||
PRODUCT_PACKAGES += \
|
PRODUCT_PACKAGES += \
|
||||||
|
@ -797,6 +799,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
|
||||||
PRODUCT_PROPERTY_OVERRIDES += \
|
PRODUCT_PROPERTY_OVERRIDES += \
|
||||||
debug.stagefright.c2inputsurface=-1 \
|
debug.stagefright.c2inputsurface=-1 \
|
||||||
|
|
||||||
|
PRODUCT_PROPERTY_OVERRIDES += media.c2.hal.selection=aidl
|
||||||
|
|
||||||
# 2. OpenMAX IL
|
# 2. OpenMAX IL
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
device/google/zuma/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
|
device/google/zuma/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue