Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b858192 authored by Bowgo Tsai's avatar Bowgo Tsai Committed by android-build-merger
Browse files

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

am: aba6c98f

Change-Id: Ib656c67f04518e185087a94dd373afbeff95579f
parents c0d20c3e aba6c98f

target/board/BoardConfigGsiCommon.mk

+2 −4
Original line number Diff line number Diff line
@@ -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.

target/board/treble_common.mk

+2 −4
Original line number Diff line number Diff line
@@ -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