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

Commit 631900e6 authored by Bowgo Tsai's avatar Bowgo Tsai Committed by Anton Hansson
Browse files

Enable /cache mount point 

Non-A/B devices using AOSP OTA flow will mount /cache in the
fstab file. Without setting BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE,
/cache will be a symlink to /data/cache which introduces the
failure of `mount_all /vendor/etc/fstab.{ro.hardware}`. This is
because all devices laucned in P need to switch to "system-as-root".

This CL sets board config to create /cache directory in rootfs
(system-as-root GSI image). Note that A/B devices doesn't mount
or use /cache so leaving an empty /cache in rootfs has no harm.

Bug: 78485405
Test: Boot GSI on walleye
Change-Id: Ic260d2917cc64c9497f5f60ea11303e953e80efd
Merged-In: Ic260d2917cc64c9497f5f60ea11303e953e80efd
parent 3613193b

target/board/generic/BoardConfig.mk

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,11 @@ BOARD_FLASH_BLOCK_SIZE := 512 
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

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



# 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

BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216



BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common

BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

target/board/generic_arm64/BoardConfig.mk

+5 −0
Original line number Diff line number Diff line
@@ -86,6 +86,11 @@ BOARD_FLASH_BLOCK_SIZE := 512 
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true

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



# 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

BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216



BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true

BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common

target/board/generic_arm64_ab/BoardConfig.mk

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true 
BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist

BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp



# 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

BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216



# TODO(b/36764215): remove this setting when the generic system image

# no longer has QCOM-specific directories under /.

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

target/board/generic_arm_ab/BoardConfig.mk

+5 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true 
BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist

BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp



# 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

BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216



# TODO(b/36764215): remove this setting when the generic system image

# no longer has QCOM-specific directories under /.

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

target/board/generic_x86/BoardConfig.mk

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

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



# 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

BOARD_CACHEIMAGE_PARTITION_SIZE := 16777216



BOARD_SEPOLICY_DIRS += \

        device/generic/goldfish/sepolicy/common \

        device/generic/goldfish/sepolicy/x86