Snap for 8001728 from 1252f9c851 to tm-release

Change-Id: Iee330e8ce51c78169b77be73b5a20dd9f680ab1b
This commit is contained in:
Android Build Coastguard Worker 2021-12-15 02:02:03 +00:00
commit b5f87fb305
5 changed files with 19 additions and 11 deletions

View file

@ -10,10 +10,6 @@ product /product
vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount
vendor_dlkm /vendor_dlkm ext4 ro,barrier=1 wait,slotselect,avb=vbmeta,logical,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount
/dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs ext4 defaults,noatime,rw wait,check,formattable
/dev/block/platform/14700000.ufs/by-name/efs_backup /mnt/vendor/efs_backup ext4 defaults,noatime,rw wait,check,formattable
/dev/block/platform/14700000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata ext4 defaults,noatime,rw wait,check,formattable
/dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img ext4 ro,defaults,context=u:object_r:modem_img_file:s0,barrier=1 wait,slotselect
/dev/block/platform/14700000.ufs/by-name/misc /misc emmc defaults wait
/dev/block/platform/14700000.ufs/by-name/metadata /metadata ext4 noatime,nosuid,nodev,data=journal,commit=1 wait,check,formattable,first_stage_mount,metadata_csum
/dev/block/platform/14700000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount

7
conf/fstab.modem Normal file
View file

@ -0,0 +1,7 @@
# Android fstab file.
# <src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
# Keep persist in an fstab file, since we need to run fsck on it after abnormal shutdown.
/dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs ext4 defaults,noatime,rw wait,check,formattable
/dev/block/platform/14700000.ufs/by-name/efs_backup /mnt/vendor/efs_backup ext4 defaults,noatime,rw wait,check,formattable
/dev/block/platform/14700000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata ext4 defaults,noatime,rw wait,check,formattable
/dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img ext4 ro,defaults,context=u:object_r:modem_img_file:s0,barrier=1 wait,slotselect

View file

@ -16,6 +16,7 @@ service vendor.charger /system/bin/charger
on early-init
mount_all /vendor/etc/fstab.persist --early
mount_all /vendor/etc/fstab.modem --early
on init
# CPU0 cannot be offline
@ -117,11 +118,11 @@ on init
mkdir /dev/socket/pdx/system/vr/sensors 0775 system system
# Boot time 183626384
write /sys/kernel/vendor_sched/ta_uclamp_min 308
write /sys/kernel/vendor_sched/ta_uclamp_min 1024
write /sys/kernel/vendor_sched/ta_prefer_idle 1
write /sys/kernel/vendor_sched/fg_uclamp_min 308
write /sys/kernel/vendor_sched/fg_uclamp_min 1024
write /sys/kernel/vendor_sched/fg_prefer_idle 1
write /sys/kernel/vendor_sched/sys_uclamp_min 308
write /sys/kernel/vendor_sched/sys_uclamp_min 1024
write /sys/kernel/vendor_sched/sys_prefer_idle 1
# governor setting

View file

@ -251,6 +251,10 @@ PRODUCT_PACKAGES += \
fstab.gs101-fips.vendor_ramdisk
PRODUCT_COPY_FILES += \
device/google/gs101/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist
ifneq ($(BOARD_WITHOUT_RADIO),true)
PRODUCT_COPY_FILES += \
device/google/gs101/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem
endif
# Shell scripts
PRODUCT_COPY_FILES += \
@ -342,7 +346,7 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml
# Sensors
ifneq (,$(filter citron tangor, $(TARGET_PRODUCT)))
ifneq (,$(findstring tangor, $(TARGET_PRODUCT)))
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \
frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \

View file

@ -74,7 +74,7 @@
"Params":
{
"Controller": "cpu",
"Path": "dex2oat"
"Path": "system"
}
},
{
@ -135,7 +135,7 @@
"Params":
{
"Controller": "cpu",
"Path": "background"
"Path": "system"
}
},
{
@ -245,7 +245,7 @@
"Params":
{
"Controller": "cpu",
"Path": "system-background"
"Path": "system"
}
},
{