diff options
author | Amit Pundir <amit.pundir@linaro.org> | 2021-01-15 00:59:21 +0530 |
---|---|---|
committer | Amit Pundir <amit.pundir@linaro.org> | 2021-01-15 01:46:44 +0530 |
commit | 04e4b2fb76e75b517b6e5ce7fa9519575a15d4e2 (patch) | |
tree | 1311e89a457e4ceadca89a6d14a28f146f46cce6 | |
parent | 44f3990603403ab80bf74fece9950efdb22a3eae (diff) |
Revert "db845c: Add support for cache partition"
This reverts commit 70f37c65199443d2502da58ecb81a4be28d36d80.
With Virtual A/B, we no longer need cache partition
for "adb remount" to work with overlayfs.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Change-Id: I979e61c4a64a8d0b1c7345491f4924c1d3fa62e0
-rw-r--r-- | BoardConfigCommon.mk | 3 | ||||
-rw-r--r-- | fstab.common | 1 | ||||
-rwxr-xr-x | installer/db845c/flash-all-aosp.sh | 2 | ||||
-rw-r--r-- | sepolicy/file_contexts | 1 |
4 files changed, 0 insertions, 7 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index d527c0e..b879d96 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -41,9 +41,6 @@ BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_PRODUCT := product BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_USES_METADATA_PARTITION := true -# Cache partition size: 64M -BOARD_CACHEIMAGE_PARTITION_SIZE := 67108864 -BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 # Super partition TARGET_USE_DYNAMIC_PARTITIONS := true BOARD_BUILD_SUPER_IMAGE_BY_DEFAULT := true diff --git a/fstab.common b/fstab.common index a0d925f..c6e1332 100644 --- a/fstab.common +++ b/fstab.common @@ -1,7 +1,6 @@ system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect /dev/block/platform/soc@0/1d84000.ufshc/by-name/userdata /data ext4 discard,noatime,noauto_da_alloc,data=ordered,user_xattr,barrier=1,inlinecrypt wait,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,quota /dev/block/platform/soc@0/1d84000.ufshc/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable -/dev/block/platform/soc@0/1d84000.ufshc/by-name/cache /cache ext4 nodev,noatime,nosuid,errors=panic wait /dev/block/platform/soc@0/1d84000.ufshc/by-name/misc /misc emmc defaults defaults /devices/platform/soc@0/8804000.sdhci/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect diff --git a/installer/db845c/flash-all-aosp.sh b/installer/db845c/flash-all-aosp.sh index b3c677b..e6b1995 100755 --- a/installer/db845c/flash-all-aosp.sh +++ b/installer/db845c/flash-all-aosp.sh @@ -40,8 +40,6 @@ echo "FLASH-ALL-AOSP: Flash boot img" fastboot flash boot "${ANDROID_PRODUCT_OUT}"/boot.img echo "FLASH-ALL-AOSP: Flash super/dynamic image" fastboot flash super "${ANDROID_PRODUCT_OUT}"/super.img -echo "FLASH-ALL-AOSP: Flash cache image" -fastboot flash cache "${ANDROID_PRODUCT_OUT}"/cache.img echo "FLASH-ALL-AOSP: Flash userdata image" fastboot flash userdata "${ANDROID_PRODUCT_OUT}"/userdata.img diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index f70cc5f..70ab83c 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -4,7 +4,6 @@ /dev/block/platform/soc@0/1d84000\.ufshc/by-name/metadata u:object_r:metadata_block_device:s0 /dev/block/platform/soc@0/1d84000\.ufshc/by-name/super u:object_r:super_block_device:s0 /dev/block/platform/soc@0/1d84000\.ufshc/by-name/userdata u:object_r:userdata_block_device:s0 -/dev/block/platform/soc@0/1d84000\.ufshc/by-name/cache u:object_r:cache_block_device:s0 /dev/block/platform/soc@0/1d84000\.ufshc/by-name/misc u:object_r:misc_block_device:s0 /dev/dri u:object_r:dri_device:s0 |