diff options
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 10 | ||||
| -rw-r--r-- | rootdir/init.rc | 20 |
2 files changed, 27 insertions, 3 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index ac8e8478a9..77fa94e739 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -131,6 +131,16 @@ LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/vendor_dlkm # via /vendor/lib/modules directly. LOCAL_POST_INSTALL_CMD += ; ln -sf /vendor/vendor_dlkm/etc $(TARGET_ROOT_OUT)/vendor_dlkm/etc +# For /odm_dlkm partition. +LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/odm_dlkm +# For Treble Generic System Image (GSI), system-as-root GSI needs to work on +# both devices with and without /odm_dlkm partition. Those symlinks are for +# devices without /odm_dlkm partition. For devices with /odm_dlkm +# partition, mount odm_dlkm.img under /odm_dlkm will hide those symlinks. +# Note that /odm_dlkm/lib is omitted because odm DLKMs should be accessed +# via /odm/lib/modules directly. +LOCAL_POST_INSTALL_CMD += ; ln -sf /odm/odm_dlkm/etc $(TARGET_ROOT_OUT)/odm_dlkm/etc + ifdef BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE LOCAL_POST_INSTALL_CMD += ; mkdir -p $(TARGET_ROOT_OUT)/cache else diff --git a/rootdir/init.rc b/rootdir/init.rc index fb6f1bea27..6ef3bdca69 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -81,6 +81,11 @@ on early-init # Mount tracefs mount tracefs tracefs /sys/kernel/tracing + # create sys dirctory + mkdir /dev/sys 0755 system system + mkdir /dev/sys/fs 0755 system system + mkdir /dev/sys/block 0755 system system + # Run boringssl self test for each ABI so that later processes can skip it. http://b/139348610 on early-init && property:ro.product.cpu.abilist32=* exec_start boringssl_self_test32 @@ -867,17 +872,26 @@ on boot chown root system /sys/block/zram0/writeback chmod 0664 /sys/block/zram0/writeback + # to access F2FS sysfs on dm-<num> directly + mkdir /dev/sys/fs/by-name 0755 system system + symlink /sys/fs/f2fs/${dev.mnt.blk.data} /dev/sys/fs/by-name/userdata + + # to access dm-<num> sysfs + mkdir /dev/sys/block/by-name 0755 system system + symlink /sys/devices/virtual/block/${dev.mnt.blk.data} /dev/sys/block/by-name/userdata + # F2FS tuning. Set cp_interval larger than dirty_expire_centisecs, 30 secs, # to avoid power consumption when system becomes mostly idle. Be careful # to make it too large, since it may bring userdata loss, if they # are not aware of using fsync()/sync() to prepare sudden power-cut. - write /sys/fs/f2fs/${dev.mnt.blk.data}/cp_interval 200 - write /sys/fs/f2fs/${dev.mnt.blk.data}/gc_urgent_sleep_time 50 + write /dev/sys/fs/by-name/userdata/cp_interval 200 + write /dev/sys/fs/by-name/userdata/gc_urgent_sleep_time 50 + write /dev/sys/fs/by-name/userdata/iostat_enable 1 # limit discard size to 128MB in order to avoid long IO latency # for filesystem tuning first (dm or sda) # Note that, if dm-<num> is used, sda/mmcblk0 should be tuned in vendor/init.rc - write /sys/devices/virtual/block/${dev.mnt.blk.data}/queue/discard_max_bytes 134217728 + write /dev/sys/block/by-name/userdata/queue/discard_max_bytes 134217728 # Permissions for System Server and daemons. chown system system /sys/power/autosleep |