Merge "Move GKI common settings to BoardConfigGkiCommon.mk" (5b77e84a) · Commits · e / os / android_build

target/board/BoardConfigGkiCommon.mk

0 → 100644

+44 −0

Original line number	Original line	Diff line number	Diff line
			# Copyright (C) 2021 The Android Open Source Project
			#
			# Licensed under the Apache License, Version 2.0 (the "License");
			# you may not use this file except in compliance with the License.
			# You may obtain a copy of the License at
			#
			# http://www.apache.org/licenses/LICENSE-2.0
			#
			# Unless required by applicable law or agreed to in writing, software
			# distributed under the License is distributed on an "AS IS" BASIS,
			# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			# See the License for the specific language governing permissions and
			# limitations under the License.
			#

			# Enable GKI 2.0 signing.
			BOARD_GKI_SIGNING_KEY_PATH := build/make/target/product/gsi/testkey_rsa2048.pem
			BOARD_GKI_SIGNING_ALGORITHM := SHA256_RSA2048

			# The following is needed to allow release signing process appends more extra
			# args, e.g., passing --signing_helper_with_files from mkbootimg to avbtool.
			# See b/178559811 for more details.
			BOARD_GKI_SIGNING_SIGNATURE_ARGS := --prop foo:bar

			# Boot image with ramdisk and kernel
			BOARD_RAMDISK_USE_LZ4 := true
			BOARD_BOOT_HEADER_VERSION := 4
			BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
			BOARD_USES_RECOVERY_AS_BOOT :=
			TARGET_NO_KERNEL := false
			BOARD_USES_GENERIC_KERNEL_IMAGE := true
			BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := \
			5.4-android12-unstable \
			5.10-android12-unstable \

			# Copy boot image in $OUT to target files. This is defined for targets where
			# the installed GKI APEXes are built from source.
			BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES := true

			# No vendor_boot
			BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT :=

			# No recovery
			BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE :=

target/board/BoardConfigGsiCommon.mk

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -30,14 +30,6 @@ BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE :=
	# the devices with metadata parition		# the devices with metadata parition
	BOARD_USES_METADATA_PARTITION := true		BOARD_USES_METADATA_PARTITION := true

	# Enable GKI 2.0 signing.
	BOARD_GKI_SIGNING_KEY_PATH := build/make/target/product/gsi/testkey_rsa2048.pem
	BOARD_GKI_SIGNING_ALGORITHM := SHA256_RSA2048
	# The following is needed to allow release signing process appends more extra
	# args, e.g., passing --signing_helper_with_files from mkbootimg to avbtool.
	# See b/178559811 for more details.
	BOARD_GKI_SIGNING_SIGNATURE_ARGS := --prop foo:bar

	# Android Verified Boot (AVB):		# Android Verified Boot (AVB):
	# Set the rollback index to zero, to prevent the device bootloader from		# Set the rollback index to zero, to prevent the device bootloader from
	# updating the last seen rollback index in the tamper-evident storage.		# updating the last seen rollback index in the tamper-evident storage.

target/board/generic_arm64/BoardConfig.mk

+1 −22

Original line number	Original line	Diff line number	Diff line
	@@ -53,6 +53,7 @@ TARGET_2ND_CPU_VARIANT := generic
	endif		endif

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

	BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920		BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920
	BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864		BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864
	@@ -73,10 +74,6 @@ BOARD_KERNEL-MAINLINE-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376

	BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800		BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800

	BOARD_RAMDISK_USE_LZ4 := true
	BOARD_BOOT_HEADER_VERSION := 4
	BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)

	BOARD_KERNEL_BINARIES := \		BOARD_KERNEL_BINARIES := \
	kernel-4.19-gz \		kernel-4.19-gz \
	kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 \		kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 \
	@@ -90,24 +87,6 @@ BOARD_KERNEL_BINARIES += \

	endif		endif

	# Boot image
	BOARD_USES_RECOVERY_AS_BOOT :=
	TARGET_NO_KERNEL := false
	BOARD_USES_GENERIC_KERNEL_IMAGE := true
	BOARD_KERNEL_MODULE_INTERFACE_VERSIONS := \
	5.4-android12-unstable \
	5.10-android12-unstable \

	# Copy boot image in $OUT to target files. This is defined for targets where
	# the installed GKI APEXes are built from source.
	BOARD_COPY_BOOT_IMAGE_TO_TARGET_FILES := true

	# No vendor_boot
	BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT :=

	# No recovery
	BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE :=

	# Some vendors still haven't cleaned up all device specific directories under		# Some vendors still haven't cleaned up all device specific directories under
	# root!		# root!

target/board/generic_x86/BoardConfig.mk

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,9 +18,8 @@ TARGET_CPU_ABI := x86
	TARGET_ARCH := x86		TARGET_ARCH := x86
	TARGET_ARCH_VARIANT := x86		TARGET_ARCH_VARIANT := x86

	TARGET_PRELINK_MODULE := false

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

	ifndef BUILDING_GSI		ifndef BUILDING_GSI
	include build/make/target/board/BoardConfigEmuCommon.mk		include build/make/target/board/BoardConfigEmuCommon.mk

target/board/generic_x86_64/BoardConfig.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,8 +22,8 @@ TARGET_2ND_CPU_ABI := x86
	TARGET_2ND_ARCH := x86		TARGET_2ND_ARCH := x86
	TARGET_2ND_ARCH_VARIANT := x86_64		TARGET_2ND_ARCH_VARIANT := x86_64

	TARGET_PRELINK_MODULE := false
	include build/make/target/board/BoardConfigGsiCommon.mk		include build/make/target/board/BoardConfigGsiCommon.mk

	ifndef BUILDING_GSI		ifndef BUILDING_GSI
	include build/make/target/board/BoardConfigEmuCommon.mk		include build/make/target/board/BoardConfigEmuCommon.mk