Merge "Refactor GSI BoardConfig.mk" am: 104904bdf0 am: eec9c48a6a (9d71661e) · Commits · e / os / android_build

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.

+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.

+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

+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

+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