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

Commit 79bfba05 authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Enable dyanmic image size for GSI 

The original size number of GSI are fixed size. Change to give
size by the content with appending 64M bytes space.

Bug: 71970853
Test: `make systemimage` and check the out system.img
Change-Id: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
Merged-In: I345f5e22c2fee7b553fc3337e9bff0ba28f579e1
parent e9bee376

target/board/BoardConfigGsiCommon.mk

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ TARGET_USERIMAGES_USE_EXT4 := true 
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

TARGET_USES_MKE2FS := true



# Enable dyanmic system image size and reserved 64MB in it.

BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864



# Android Verified Boot (AVB):

#   Builds a special vbmeta.img that disables AVB verification.

#   Otherwise, AVB will prevent the device from booting the generic system.img.

target/board/generic/BoardConfig.mk

+0 −2
Original line number Diff line number Diff line
@@ -48,6 +48,4 @@ TARGET_CPU_ABI2 := armeabi 
include build/make/target/board/BoardConfigEmuCommon.mk

include build/make/target/board/BoardConfigGsiCommon.mk



# Partition size is default 1.5GB (1536MB) for 64 bits projects

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736

BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800

target/board/generic_arm64/BoardConfig.mk

+0 −2
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ endif 
include build/make/target/board/BoardConfigEmuCommon.mk

include build/make/target/board/BoardConfigGsiCommon.mk



# Partition size is default 1.5GB (1536MB) for 64 bits projects

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736

BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800



# Emulator system image is going to be used as GSI and some vendor still hasn't

target/board/generic_arm_a/BoardConfig.mk

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


include build/make/target/board/treble_common_32.mk



# Overwrite the setting in treble_common_32.mk for non-A/B arm GSI

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 805306368 # 768MB



TARGET_ARCH := arm

TARGET_ARCH_VARIANT := armv7-a-neon

TARGET_CPU_ABI := armeabi-v7a

target/board/generic_arm_ab/BoardConfig.mk

+0 −3
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


include build/make/target/board/treble_common_32.mk



# Overwrite the setting in treble_common_32.mk for non-A/B arm GSI

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 805306368 # 768MB



TARGET_ARCH := arm

TARGET_ARCH_VARIANT := armv7-a-neon

TARGET_CPU_ABI := armeabi-v7a