From 6924b25729541cba612241aebbd491aae51a2f43 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Tue, 11 Sep 2018 19:19:05 +0800 Subject: [PATCH] Fix build error for sdk_gphone_x86_64-userdebug Increases BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE to 128MB to fix the build break. This is because we enabled AVB signing in the following CL. And verified boot metadata will consume the reserved size in current build system. https://android-review.googlesource.com/c/platform/build/+/745691 Bug: None Test: build sdk_gphone_x86_64-userdebug Change-Id: If1f44dccbc3a69b1b38a23e979f50c2c52401a25 --- target/board/BoardConfigGsiCommon.mk | 6 ++++-- target/board/treble_common.mk | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 7319fec077..1df981b073 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -10,8 +10,10 @@ TARGET_USERIMAGES_USE_EXT4 := true # we explicit specify this need below (even though it's the current default). TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false -# Enable dyanmic system image size and reserved 64MB in it. -BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 +# Enable dynamic system image size and reserved 128MB in it. +# Currently the reserve size includes verified boot metadata. +# TODO: adjust to a smaller value if the reserved size is only for file system. +BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 134217728 # Android Verified Boot (AVB): # 1) Sets BOARD_AVB_ENABLE to sign the GSI image. diff --git a/target/board/treble_common.mk b/target/board/treble_common.mk index ccb69f2ed3..186900074d 100644 --- a/target/board/treble_common.mk +++ b/target/board/treble_common.mk @@ -35,8 +35,10 @@ TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false -# Enable dyanmic system image size and reserved 64MB in it. -BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 +# Enable dynamic system image size and reserved 128MB in it. +# Currently the reserve size includes verified boot metadata. +# TODO: adjust to a smaller value if the reserved size is only for file system. +BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 134217728 # Generic AOSP image always requires separate vendor.img TARGET_COPY_OUT_VENDOR := vendor