diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index 55cd546e1..1e325b949 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -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 + diff --git a/target/board/BoardConfigGsiCommon.mk b/target/board/BoardConfigGsiCommon.mk index a853b3c69..f9e9ee100 100644 --- a/target/board/BoardConfigGsiCommon.mk +++ b/target/board/BoardConfigGsiCommon.mk @@ -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 diff --git a/target/board/generic_arm64_a/BoardConfig.mk b/target/board/generic_arm64_a/BoardConfig.mk index f77dbe5f8..68aedfc1a 100644 --- a/target/board/generic_arm64_a/BoardConfig.mk +++ b/target/board/generic_arm64_a/BoardConfig.mk @@ -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 diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk index 073eccb9d..6e54d810b 100644 --- a/target/board/generic_arm64_ab/BoardConfig.mk +++ b/target/board/generic_arm64_ab/BoardConfig.mk @@ -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 diff --git a/target/board/generic_arm_a/BoardConfig.mk b/target/board/generic_arm_a/BoardConfig.mk index cba222a73..464a74f1e 100644 --- a/target/board/generic_arm_a/BoardConfig.mk +++ b/target/board/generic_arm_a/BoardConfig.mk @@ -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 diff --git a/target/board/generic_arm_ab/BoardConfig.mk b/target/board/generic_arm_ab/BoardConfig.mk index 087543e92..9100094f8 100644 --- a/target/board/generic_arm_ab/BoardConfig.mk +++ b/target/board/generic_arm_ab/BoardConfig.mk @@ -25,21 +25,12 @@ TARGET_CPU_VARIANT := generic # Legacy GSI keeps 32 bits binder for 32 bits CPU Arch TARGET_USES_64_BIT_BINDER := false -# 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 diff --git a/target/board/generic_x86_64_a/BoardConfig.mk b/target/board/generic_x86_64_a/BoardConfig.mk index 1dd5e4898..07eef4f42 100644 --- a/target/board/generic_x86_64_a/BoardConfig.mk +++ b/target/board/generic_x86_64_a/BoardConfig.mk @@ -23,3 +23,6 @@ TARGET_ARCH_VARIANT := x86_64 TARGET_2ND_CPU_ABI := x86 TARGET_2ND_ARCH := x86 TARGET_2ND_ARCH_VARIANT := x86_64 + +# This is a non-system-as-root Legacy GSI build target +BOARD_BUILD_SYSTEM_ROOT_IMAGE := false diff --git a/target/board/generic_x86_64_ab/BoardConfig.mk b/target/board/generic_x86_64_ab/BoardConfig.mk index 09ce95d67..1dd5e4898 100644 --- a/target/board/generic_x86_64_ab/BoardConfig.mk +++ b/target/board/generic_x86_64_ab/BoardConfig.mk @@ -23,12 +23,3 @@ TARGET_ARCH_VARIANT := x86_64 TARGET_2ND_CPU_ABI := x86 TARGET_2ND_ARCH := x86 TARGET_2ND_ARCH_VARIANT := x86_64 - -# Enable System-as-Root -TARGET_NO_RECOVERY := true -BOARD_BUILD_SYSTEM_ROOT_IMAGE := 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 -BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216 diff --git a/target/board/generic_x86_a/BoardConfig.mk b/target/board/generic_x86_a/BoardConfig.mk index 53acffd23..e3e8a3afe 100644 --- a/target/board/generic_x86_a/BoardConfig.mk +++ b/target/board/generic_x86_a/BoardConfig.mk @@ -22,3 +22,6 @@ TARGET_ARCH_VARIANT := x86 # 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 diff --git a/target/board/generic_x86_ab/BoardConfig.mk b/target/board/generic_x86_ab/BoardConfig.mk index cc8ab70ce..53acffd23 100644 --- a/target/board/generic_x86_ab/BoardConfig.mk +++ b/target/board/generic_x86_ab/BoardConfig.mk @@ -22,12 +22,3 @@ TARGET_ARCH_VARIANT := x86 # Legacy GSI keeps 32 bits binder for 32 bits CPU Arch TARGET_USES_64_BIT_BINDER := false - -# Enable System-as-Root -TARGET_NO_RECOVERY := true -BOARD_BUILD_SYSTEM_ROOT_IMAGE := 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 -BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216