From e9046cbbaa3c71e49c7763ecf7ee3c3dc2517d7e Mon Sep 17 00:00:00 2001 From: bohu Date: Tue, 28 Nov 2017 09:24:02 -0800 Subject: [PATCH] emulator: support system-as-root BUG: 69770927 Test: build sdk_gphone_x86-userdebug, boot up to home with Tot emulator Test: build sdk_phone_armv7-userdebug, boot up to home with Tot emulator Change-Id: I39348bf35cb748c08ed68a048389bbfc2279a91c Merged-In: I39348bf35cb748c08ed68a048389bbfc2279a91c --- target/board/generic/BoardConfig.mk | 6 ++++-- target/board/generic_arm64/BoardConfig.mk | 6 ++++-- target/board/generic_mips/BoardConfig.mk | 6 ++++-- target/board/generic_mips64/BoardConfig.mk | 6 ++++-- target/board/generic_x86/BoardConfig.mk | 6 ++++-- target/board/generic_x86_64/BoardConfig.mk | 6 ++++-- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/target/board/generic/BoardConfig.mk b/target/board/generic/BoardConfig.mk index 331f08219..8d93f7519 100644 --- a/target/board/generic/BoardConfig.mk +++ b/target/board/generic/BoardConfig.mk @@ -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 diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index 9beb9a3ef..9d2ccbd98 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -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 diff --git a/target/board/generic_mips/BoardConfig.mk b/target/board/generic_mips/BoardConfig.mk index fb66d21f8..523408b54 100644 --- a/target/board/generic_mips/BoardConfig.mk +++ b/target/board/generic_mips/BoardConfig.mk @@ -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 diff --git a/target/board/generic_mips64/BoardConfig.mk b/target/board/generic_mips64/BoardConfig.mk index 67bb51f71..2052d7bc7 100644 --- a/target/board/generic_mips64/BoardConfig.mk +++ b/target/board/generic_mips64/BoardConfig.mk @@ -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 diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 000a9a310..0b39af1f9 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -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 diff --git a/target/board/generic_x86_64/BoardConfig.mk b/target/board/generic_x86_64/BoardConfig.mk index 883dd2e5c..3a4bde646 100755 --- a/target/board/generic_x86_64/BoardConfig.mk +++ b/target/board/generic_x86_64/BoardConfig.mk @@ -50,8 +50,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 BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true @@ -60,3 +58,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