From 43a52c74aec22fcf161a5982aa36e9afd5513f0d Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 26 Nov 2024 12:46:08 -0800 Subject: Disable sparse filesystems The filesystems should not be parse unless one of the size-related variables are set, but currently filesystems don't support setting those size variables. Bug: 381120092 Test: m out/soong/.intermediates/build/soong/fsgen/aosp_cf_x86_64_phone_generated_system_image/android_common/aosp_cf_x86_64_phone_generated_system_image.img && file out/soong/.intermediates/build/soong/fsgen/aosp_cf_x86_64_phone_generated_system_image/android_common/aosp_cf_x86_64_phone_generated_system_image.img; observe that the filesystem is erofs instead of android sparse image Change-Id: I741531d5af8ad85664658995cd9fd3b46533d73c --- filesystem/filesystem.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index dadacae3d..019cc2579 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -594,6 +594,13 @@ func (f *filesystem) buildPropFile(ctx android.ModuleContext) (android.Path, and addStr("hash_seed", uuid) } + // TODO(b/381120092): This should only be added if none of the size-related properties are set, + // but currently soong built partitions don't have size properties. Make code: + // https://cs.android.com/android/platform/superproject/main/+/main:build/make/core/Makefile;l=2262;drc=39cd33701c9278db0e7e481a090605f428d5b12d + // Make uses system_disable_sparse but disable_sparse has the same effect, and we shouldn't need + // to qualify it because each partition gets its own property file built. + addStr("disable_sparse", "true") + fst := f.fsType(ctx) switch fst { case erofsType: -- cgit v1.2.3-59-g8ed1b