From 36d09bf13fccd5c7a7154758256b04429d031390 Mon Sep 17 00:00:00 2001 From: Thierry Strudel Date: Tue, 9 May 2017 12:19:11 -0700 Subject: [PATCH] move fstab and BOARD_AVB_ENABLE to wahoo Change-Id: I057403bb22241cc756f714019f4c2d2efeb4cd3e Signed-off-by: Thierry Strudel --- BoardConfig.mk | 3 +++ device.mk | 4 ++-- fstab.hardware | 9 +++++++++ init.hardware.rc | 6 ++++-- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 fstab.hardware diff --git a/BoardConfig.mk b/BoardConfig.mk index 8d3d1c7d..3d9a513c 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -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 diff --git a/device.mk b/device.mk index 3f388ab1..c71695a0 100755 --- a/device.mk +++ b/device.mk @@ -478,8 +478,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 += \ diff --git a/fstab.hardware b/fstab.hardware new file mode 100644 index 00000000..ceb847bb --- /dev/null +++ b/fstab.hardware @@ -0,0 +1,9 @@ +# Android fstab file. + +# +/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,keydirectory=/metadata,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 diff --git a/init.hardware.rc b/init.hardware.rc index 6dd57f22..562dc51a 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -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