Merge "Revert "Fix build error for sdk_gphone_x86_64-userdebug"" am: 3e795ee38b am: aba6c98fd2

am: 9b858192b7

Change-Id: I709ddec3f7f0dedd34c0992361010471002eb79c
This commit is contained in:
Bowgo Tsai 2018-10-04 00:02:46 -07:00 committed by android-build-merger
commit 94a6706eec
2 changed files with 4 additions and 8 deletions

View File

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

View File

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