StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unset system-as-root for mainline" am: 2f5e18362b am: d3229a7179

Browse Source 
am: 508d4a2797

Change-Id: I4edec0fd236f7c53087f436a2ddfd3c65cca7ee5
This commit is contained in:
Anton Hansson
2019-03-26 14:26:33 -07:00
committed by android-build-merger
parent b73674c62f 508d4a2797
commit 6e1026e591
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/board/BoardConfigEmuCommon.mk
View File

@@ -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

5
target/board/BoardConfigMainlineCommon.mk
View File

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