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

Commit a2d5ed1b authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Fix Legacy GSI settings for BoardConfigGsiCommon.mk 

Legacy GSI had been changed to include BoardConfigGsiCommon.mk
instead of treble_common*.mk. However, some default settings are
different than the original. This patch fixes
BOARD_BUILD_SYSTEM_ROOT_IMAGE in Legacy GSI makefiles.

The patch also removes redundant settings and fix some comments.

Bug: 122282239
Test: make
Change-Id: Ie4eb8cf410bfd2edc74648c0e5ee81028242a1b7
parent 104904bd

target/board/BoardConfigEmuCommon.mk

+1 −1
Original line number Diff line number Diff line
@@ -29,4 +29,4 @@ BOARD_FLASH_BLOCK_SIZE := 512 
DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml



BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common

BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

target/board/BoardConfigGsiCommon.mk

+6 −4
Original line number Diff line number Diff line
@@ -25,9 +25,13 @@ TARGET_USERIMAGES_USE_F2FS := true 
# Enable dynamic system image size and reserved 64MB in it.

BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 67108864



# Generic AOSP image always requires separate vendor.img

# GSI always requires separate vendor packages to vendor.img

TARGET_COPY_OUT_VENDOR := vendor



# Creates metadata partition mount point under root for

# the devices with metadata parition

BOARD_USES_METADATA_PARTITION := true



# Android Verified Boot (AVB):

#   Set AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (--flag 2) in

#   vbmeta.img to disable AVB verification.
@@ -43,15 +47,13 @@ BOARD_AVB_SYSTEM_ALGORITHM := SHA256_RSA2048 
BOARD_AVB_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)

BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 1



# GSI specific System Properties

ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))

# GSI is always userdebug and needs a couple of properties taking precedence

# over those set by the vendor.

TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop

endif



# Android generic system image always create metadata partition

BOARD_USES_METADATA_PARTITION := true



# Set this to create /cache mount point for non-A/B devices that mounts /cache.

# The partition size doesn't matter, just to make build pass.

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

target/board/generic_arm64_a/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -27,3 +27,6 @@ TARGET_2ND_ARCH_VARIANT := armv8-a 
TARGET_2ND_CPU_ABI := armeabi-v7a

TARGET_2ND_CPU_ABI2 := armeabi

TARGET_2ND_CPU_VARIANT := generic



# This is a non-system-as-root Legacy GSI build target

BOARD_BUILD_SYSTEM_ROOT_IMAGE := false

target/board/generic_arm64_ab/BoardConfig.mk

+0 −9
Original line number Diff line number Diff line
@@ -28,21 +28,12 @@ TARGET_2ND_CPU_ABI := armeabi-v7a 
TARGET_2ND_CPU_ABI2 := armeabi

TARGET_2ND_CPU_VARIANT := generic



# Enable System-as-Root

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true



# TODO(jiyong) These might be SoC specific.

BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist

BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp

BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image

BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo



# Set this to create /cache mount point for non-A/B devices that mounts /cache.

# The partition size doesn't matter, just to make build pass.

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216



# TODO(b/36764215): remove this setting when the generic system image

# no longer has QCOM-specific directories under /.

BOARD_SEPOLICY_DIRS += build/target/board/generic_arm64_ab/sepolicy

target/board/generic_arm_a/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -24,3 +24,6 @@ TARGET_CPU_VARIANT := generic 


# Legacy GSI keeps 32 bits binder for 32 bits CPU Arch

TARGET_USES_64_BIT_BINDER := false



# This is a non-system-as-root Legacy GSI build target

BOARD_BUILD_SYSTEM_ROOT_IMAGE := false