Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd2f9440 authored by Anton Hansson's avatar Anton Hansson
Browse files

Unset system-as-root for mainline 

This flag is not allowed to be true when dynamic partitions are
enabled, which mainline devices are expected to do.

Bug: 80410283
Test: make
Change-Id: I50c9fe9332ea1490a84484f9311cfe001a083754
parent 94fa0e75

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

target/board/BoardConfigMainlineCommon.mk

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