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

Commit 253dfc22 authored by bohu's avatar bohu Committed by android-build-merger
Browse files

Merge "emulator: support system-as-root" 

am: 44e363f1

Change-Id: Ib1ea4ec4f388a1d28f6db2789029aa06c169c3da
parents 6e11749f 44e363f1

target/board/generic/BoardConfig.mk

+4 −2
Original line number Diff line number Diff line
@@ -57,11 +57,13 @@ TARGET_COPY_OUT_VENDOR := vendor 
# when finalizing them.

BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_FLASH_BLOCK_SIZE := 512

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml



BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy

BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true



# Enable A/B update

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

target/board/generic_arm64/BoardConfig.mk

+4 −2
Original line number Diff line number Diff line
@@ -88,11 +88,13 @@ TARGET_COPY_OUT_VENDOR := vendor 
# when finalizing them.

BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_FLASH_BLOCK_SIZE := 512

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml



BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy



# Enable A/B update

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

target/board/generic_mips/BoardConfig.mk

+4 −2
Original line number Diff line number Diff line
@@ -65,10 +65,12 @@ TARGET_COPY_OUT_VENDOR := vendor 
# when finalizing them.

BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_FLASH_BLOCK_SIZE := 512

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml



BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy



# Enable A/B update

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

target/board/generic_mips64/BoardConfig.mk

+4 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ TARGET_COPY_OUT_VENDOR := vendor 
# when finalizing them.

BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_FLASH_BLOCK_SIZE := 512

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml
@@ -89,3 +87,7 @@ DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml 
BOARD_SEPOLICY_DIRS += build/target/board/generic/sepolicy



DEX_PREOPT_DEFAULT := nostripping



# Enable A/B update

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true

target/board/generic_x86/BoardConfig.mk

+4 −2
Original line number Diff line number Diff line
@@ -48,8 +48,6 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true 
# when finalizing them.

BOARD_VENDORIMAGE_PARTITION_SIZE := 100000000

BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_CACHEIMAGE_PARTITION_SIZE := 69206016

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

BOARD_FLASH_BLOCK_SIZE := 512

TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

DEVICE_MATRIX_FILE   := device/generic/goldfish/compatibility_matrix.xml
@@ -57,3 +55,7 @@ DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml 
BOARD_SEPOLICY_DIRS += \

        build/target/board/generic/sepolicy \

        build/target/board/generic_x86/sepolicy



# Enable A/B update

TARGET_NO_RECOVERY := true

BOARD_BUILD_SYSTEM_ROOT_IMAGE := true