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

Commit 5d356e23 authored by SzuWei Lin's avatar SzuWei Lin
Browse files

Enable metadata in GSI 

Add BOARD_USES_METADATA_PARTITION to GSI to enable metadata folder
under the root folder.

Bug: 80407843
Bug: 79781913
Test: Boot on a Pixel device with GSI applied the patch
Change-Id: I5544b76b54300aa5a87aa4fa3c0ec6feff13a554
parent 221be663

target/board/generic/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ BOARD_FLASH_BLOCK_SIZE := 512 
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

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



# Android generic system image always create metadata partition

BOARD_USES_METADATA_PARTITION := true



# Set this to create /cache mount point for non-A/B devices that mounts /cache.

# The partition size doesn't matter, just to make build pass.

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

target/board/generic_arm64/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ BOARD_FLASH_BLOCK_SIZE := 512 
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

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



# Android generic system image always create metadata partition

BOARD_USES_METADATA_PARTITION := true



# Set this to create /cache mount point for non-A/B devices that mounts /cache.

# The partition size doesn't matter, just to make build pass.

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

target/board/generic_x86/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ BOARD_FLASH_BLOCK_SIZE := 512 
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

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



# Android generic system image always create metadata partition

BOARD_USES_METADATA_PARTITION := true



# Set this to create /cache mount point for non-A/B devices that mounts /cache.

# The partition size doesn't matter, just to make build pass.

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

target/board/generic_x86_64/BoardConfig.mk

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true 
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

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



# Android generic system image always create metadata partition

BOARD_USES_METADATA_PARTITION := true



# Set this to create /cache mount point for non-A/B devices that mounts /cache.

# The partition size doesn't matter, just to make build pass.

BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4

target/board/treble_common.mk

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ TARGET_USES_MKE2FS := true 
# Generic AOSP image always requires separate vendor.img

TARGET_COPY_OUT_VENDOR := vendor



# Android generic system image always create metadata partition

BOARD_USES_METADATA_PARTITION := true



# Generic AOSP image does NOT support HWC1

TARGET_USES_HWC2 := true

# Set emulator framebuffer display device buffer count to 3