Merge "Unset system-as-root for mainline" (2f5e1836) · Commits · e / os / android_build

target/board/BoardConfigEmuCommon.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -30,3 +30,5 @@ DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml

		BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common

		# TODO(b/125540538): Remove when emulator uses dynamic partitions
		BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

+1 −4

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@
		# The generic product target doesn't have any hardware-specific pieces.
		TARGET_NO_BOOTLOADER := true
		TARGET_NO_KERNEL := true
		TARGET_NO_RECOVERY := true

		TARGET_USERIMAGES_USE_EXT4 := true

		@@ -15,10 +16,6 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
		TARGET_COPY_OUT_PRODUCT := product
		BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4

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

		BOARD_VNDK_VERSION := current

		# Required flag for non-64 bit devices from P.