From 3ac95b53f4f47e1c2c0c00199d56b064d759b41e Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Thu, 4 Oct 2018 02:14:54 +0000 Subject: [PATCH] Revert "Fix build error for sdk_gphone_x86_64-userdebug" This reverts commit 6924b25729541cba612241aebbd491aae51a2f43. Reason for revert: with the following fix, this workaround is no longer needed. https://android-review.googlesource.com/c/platform/build/+/762663 Bug: 112322265 Change-Id: I07363f6a5aa1697b6f7702343f3120e1049f07d8 Test: build sdk_gphone_x86_64-userdebug --- target/board/BoardConfigGsiCommon.mk | 6 ++---- target/board/treble_common.mk | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index 1df981b07..fe4762631 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -10,10 +10,8 @@ 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 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 +# Enable dynamic system image size and reserved 64MB in it. +BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 # 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 186900074..9413a75d0 100644 --- a/target/board/treble_common.mk +++ b/target/board/treble_common.mk @@ -35,10 +35,8 @@ TARGET_USERIMAGES_USE_EXT4 := true TARGET_USERIMAGES_USE_F2FS := true TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false -# 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 +# Enable dynamic system image size and reserved 64MB in it. +BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864 # Generic AOSP image always requires separate vendor.img TARGET_COPY_OUT_VENDOR := vendor