Enable AVB 2.0

- fix build flags to generate vbmeta image
 - fix fstab mount flags

Change-Id: I9935ded340d4831fb53cf5bea1eb5ffda1a048d2
Signed-off-by: Thierry Strudel <tstrudel@google.com>
This commit is contained in:
Thierry Strudel
2017-04-19 15:03:55 -07:00
parent 0c5aa09028
commit 34cc620963
4 changed files with 11 additions and 1 deletions

View File

@@ -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 \

View File

@@ -1,7 +1,7 @@
# 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
/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

View File

@@ -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

View File

@@ -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