From 34cc620963c69a6b21c9a11c6f5e64b42310b366 Mon Sep 17 00:00:00 2001 From: Thierry Strudel Date: Wed, 19 Apr 2017 15:03:55 -0700 Subject: [PATCH] Enable AVB 2.0 - fix build flags to generate vbmeta image - fix fstab mount flags Change-Id: I9935ded340d4831fb53cf5bea1eb5ffda1a048d2 Signed-off-by: Thierry Strudel --- device-common.mk | 4 ++++ fstab.hardware | 2 +- muskie/BoardConfig.mk | 3 +++ walleye/BoardConfig.mk | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/device-common.mk b/device-common.mk index 2d8a7b5..f10c23e 100644 --- a/device-common.mk +++ b/device-common.mk @@ -16,6 +16,10 @@ LOCAL_PATH := device/google/muskie +# verity +AB_OTA_PARTITIONS += \ + vbmeta + # Audio XMLs PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/mixer_paths_tasha.xml:system/etc/mixer_paths_tasha.xml \ diff --git a/fstab.hardware b/fstab.hardware index 785a4ab..d747cce 100644 --- a/fstab.hardware +++ b/fstab.hardware @@ -1,7 +1,7 @@ # Android fstab file. # -/dev/block/platform/soc/1da4000.ufshc/by-name/system / ext4 ro,barrier=1 wait,slotselect +/dev/block/platform/soc/1da4000.ufshc/by-name/system / ext4 ro,barrier=1 wait,slotselect,avb /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 diff --git a/muskie/BoardConfig.mk b/muskie/BoardConfig.mk index b8652f1..cc78a35 100644 --- a/muskie/BoardConfig.mk +++ b/muskie/BoardConfig.mk @@ -20,7 +20,10 @@ DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS := 0x00000056 include device/google/wahoo/BoardConfig.mk -include vendor/google_devices/muskie/BoardConfigVendor.mk +BOARD_AVB_ENABLE := true +BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560 +BOARD_VENDORIMAGE_PARTITION_SIZE := 524288000 #sepolicy common to muskie/walleye BOARD_SEPOLICY_DIRS += device/google/muskie/sepolicy diff --git a/walleye/BoardConfig.mk b/walleye/BoardConfig.mk index f862e35..1b3df5c 100644 --- a/walleye/BoardConfig.mk +++ b/walleye/BoardConfig.mk @@ -20,7 +20,10 @@ DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS := 0x00000056 include device/google/wahoo/BoardConfig.mk -include vendor/google_devices/muskie/BoardConfigVendor.mk +BOARD_AVB_ENABLE := true +BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560 +BOARD_VENDORIMAGE_PARTITION_SIZE := 524288000 #sepolicy common to muskie/walleye BOARD_SEPOLICY_DIRS += device/google/muskie/sepolicy