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

Commit 1457b3fc authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Refactor GSI BoardConfig.mk 

The patch modifies the Legacy GSI to use BoardConfigGsiCommon.mk
instead of board config treble-common*.mk, and delete these
treble-common*.mk files.

After the patch, the GSI common board configs are in single file
BoardConfigGsiCommon.mk

The patch also includes:

- Moving `TARGET_COPY_OUT_VENDOR := vendor` to
  BoardConfigGsiCommon.mk, because GSI always contains no vendor
  contents.
- Configure the binder interface bitness explicitly.
- Unify the structure of each BoardConfig.mk.

Bug: 122282239
Test: compare the out folder between with and without the patch
Test: output files are all the same
Change-Id: Ie5901446920dda317dea848e6d5a7bbcf10a32cf
parent aee5affa

target/board/BoardConfigEmuCommon.mk

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ BUILD_QEMU_IMAGES := true 
# the GLES renderer disables itself if host GL acceleration isn't available.

USE_OPENGL_RENDERER := true



TARGET_COPY_OUT_VENDOR := vendor



# ~100 MB vendor image. Please adjust system image / vendor image sizes

# when finalizing them. The partition size needs to be a multiple of image

# block size: 4096.

target/board/BoardConfigGsiCommon.mk

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


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



# Enable system property split for Treble

BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true



# This flag is set by mainline but isn't desired for GSI.

BOARD_USES_SYSTEM_OTHER_ODEX :=
@@ -14,9 +17,17 @@ BOARD_USES_SYSTEM_OTHER_ODEX := 
# we explicit specify this need below (even though it's the current default).

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false



# system.img is always ext4 with sparse option

# GSI also includes make_f2fs to support userdata parition in f2fs

# for some devices

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

TARGET_COPY_OUT_VENDOR := vendor



# Android Verified Boot (AVB):

#   Set AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED (--flag 2) in

#   vbmeta.img to disable AVB verification.

target/board/generic_arm64_a/BoardConfig.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
# limitations under the License.

#



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

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



TARGET_ARCH := arm64

TARGET_ARCH_VARIANT := armv8-a

target/board/generic_arm64_ab/BoardConfig.mk

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
# limitations under the License.

#



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

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



TARGET_ARCH := arm64

TARGET_ARCH_VARIANT := armv8-a
@@ -28,7 +28,7 @@ TARGET_2ND_CPU_ABI := armeabi-v7a 
TARGET_2ND_CPU_ABI2 := armeabi

TARGET_2ND_CPU_VARIANT := generic



# Enable A/B update

# Enable System-as-Root

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

target/board/generic_arm_a/BoardConfig.mk

+4 −1
Original line number Diff line number Diff line
@@ -14,10 +14,13 @@ 
# limitations under the License.

#



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

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



TARGET_ARCH := arm

TARGET_ARCH_VARIANT := armv7-a-neon

TARGET_CPU_ABI := armeabi-v7a

TARGET_CPU_ABI2 := armeabi

TARGET_CPU_VARIANT := generic



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

TARGET_USES_64_BIT_BINDER := false