Merge "Move some BoardConfig settings from EmuCommon to GsiCommon" into pi-dev-plus-aosp (9469377f) · Commits · e / os / android_build

target/board/BoardConfigEmuCommon.mk

+1 −12

Original line number	Diff line number	Diff line
		@@ -11,9 +11,6 @@ HAVE_HTC_AUDIO_DRIVER := true
		BOARD_USES_GENERIC_AUDIO := true
		TARGET_BOOTLOADER_BOARD_NAME := goldfish_$(TARGET_ARCH)

		TARGET_USES_64_BIT_BINDER := true
		TARGET_USES_MKE2FS := true

		# no hardware camera
		USE_CAMERA_STUB := true

		@@ -29,22 +26,14 @@ BUILD_QEMU_IMAGES := true
		USE_OPENGL_RENDERER := true

		TARGET_COPY_OUT_VENDOR := vendor

		# ~100 MB vendor image. Please adjust system image / vendor image sizes
		# when finalizing them.
		BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000
		BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
		BOARD_FLASH_BLOCK_SIZE := 512
		TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
		DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml

		# 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
		BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216

		BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common
		BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

+19 −1

Original line number	Diff line number	Diff line
		@@ -3,6 +3,13 @@
		# Common compile-time definitions for GSI
		#

		# system.img is always ext4 with sparse option
		TARGET_USERIMAGES_USE_EXT4 := true
		# TODO(b/63790380): emulator doesn't support sparse yet
		#TARGET_USERIMAGES_SPARSE_EXT_DISABLED := false
		TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
		TARGET_USES_MKE2FS := true

		# 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.
		@@ -20,9 +27,20 @@ TARGET_SYSTEM_PROP := build/make/target/board/gsi_system.prop
		endif
		BOARD_VNDK_VERSION := current

		# Pi GSI supports system-as-root
		# system-as-root is mandatory from Android P
		TARGET_NO_RECOVERY := true
		BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

		# 64 bits binder interface is mandatory from Android P
		TARGET_USES_64_BIT_BINDER := true

		# 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
		BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216

		# Audio: must using XML format for Treblized devices
		USE_XML_AUDIO_POLICY_CONF := 1

+0 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,6 @@ TARGET_CPU_ABI2 := armeabi
		include build/make/target/board/BoardConfigEmuCommon.mk
		include build/make/target/board/BoardConfigGsiCommon.mk

		TARGET_USERIMAGES_USE_EXT4 := true
		# Partition size is default 1.5GB (1536MB) for 64 bits projects
		BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
		BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800

+0 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@ endif
		include build/make/target/board/BoardConfigEmuCommon.mk
		include build/make/target/board/BoardConfigGsiCommon.mk

		TARGET_USERIMAGES_USE_EXT4 := true
		BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560 # 2.5 GB
		BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800

+0 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ TARGET_PRELINK_MODULE := false
		include build/make/target/board/BoardConfigEmuCommon.mk
		include build/make/target/board/BoardConfigGsiCommon.mk

		TARGET_USERIMAGES_USE_EXT4 := true
		BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2684354560
		# Resize to 4G to accomodate ASAN and CTS
		BOARD_USERDATAIMAGE_PARTITION_SIZE := 4294967296