Merge changes from topic 'fstab-wahoo'

* changes:
  fstab.hardware: disable metadata encryption
  move fstab and BOARD_AVB_ENABLE to wahoo
This commit is contained in:
Thierry Strudel
2017-05-09 22:02:49 +00:00
committed by Android (Google) Code Review
4 changed files with 18 additions and 4 deletions

View File

@@ -49,6 +49,9 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
# Partitions (listed in the file) to be wiped under recovery.
TARGET_RECOVERY_WIPE := device/google/wahoo/recovery.wipe
TARGET_RECOVERY_FSTAB := device/google/wahoo/fstab.hardware
BOARD_AVB_ENABLE := true
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0

View File

@@ -479,8 +479,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
# setup dalvik vm configs
$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
# Share fstab between devices
# TODO
PRODUCT_COPY_FILES += \
device/google/wahoo/fstab.hardware:root/fstab.$(PRODUCT_HARDWARE)
# Provide meaningful APN configuration
PRODUCT_COPY_FILES += \

9
fstab.hardware Normal file
View File

@@ -0,0 +1,9 @@
# Android fstab file.
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
/dev/block/platform/soc/1da4000.ufshc/by-name/system / ext4 ro,barrier=1 wait,slotselect,avb
/dev/block/platform/soc/1da4000.ufshc/by-name/metadata /metadata ext4 noatime,nosuid,nodev,barrier=1 wait,check,formattable
/dev/block/platform/soc/1da4000.ufshc/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,noauto_da_alloc latemount,wait,check,formattable,fileencryption=ice:aes-256-heh,eraseblk=16777216,logicalblk=4096
/dev/block/platform/soc/1da4000.ufshc/by-name/misc /misc emmc defaults defaults
/dev/block/platform/soc/1da4000.ufshc/by-name/modem /firmware vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait,slotselect
/devices/soc/a800000.ssusb/a800000.dwc3* auto vfat defaults voldmanaged=usb:auto

View File

@@ -203,11 +203,13 @@ on post-fs-data
# will fail
restart qseecomd
# b/38048356 Setup debug folders for camera
mkdir /data/vendor/camera 0770 camera camera
# keep that at the end of on post-fs-data
# Set indication (checked by vold) that we have finished this action
setprop vold.post_fs_data_done 1
# b/38048356 Setup debug folders for camera
mkdir /data/vendor/camera 0770 camera camera
# zygote need to be started after otapreopt which will be done on post-fs-data
on zygote-start