diff options
| author | 2024-10-11 10:31:12 -0700 | |
|---|---|---|
| committer | 2024-10-11 10:35:47 -0700 | |
| commit | 7cd4badddb33193de9d9a6381300e6b05af6541b (patch) | |
| tree | b6dc185675c9bbe982e61a0630ab3a21ac233e05 /filesystem/filesystem.go | |
| parent | a893932e1e3f679b4394cb653b61d181bc5aeccc (diff) | |
Minor cleanup of erofs property checking
Test: Presubmits
Change-Id: I4146224674c3546b7c48cb727f0662d3d347f02e
Diffstat (limited to 'filesystem/filesystem.go')
| -rw-r--r-- | filesystem/filesystem.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 87c6381c0..1e816a752 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -511,15 +511,15 @@ func (f *filesystem) buildPropFile(ctx android.ModuleContext) (propFile android. addStr("erofs_default_compressor", proptools.String(compressor)) } if compressHints := f.properties.Erofs.Compress_hints; compressHints != nil { - addStr("erofs_default_compress_hints", android.PathForModuleSrc(ctx, *compressHints).String()) + addPath("erofs_default_compress_hints", android.PathForModuleSrc(ctx, *compressHints)) } if proptools.BoolDefault(f.properties.Erofs.Sparse, true) { // https://source.corp.google.com/h/googleplex-android/platform/build/+/88b1c67239ca545b11580237242774b411f2fed9:core/Makefile;l=2292;bpv=1;bpt=0;drc=ea8f34bc1d6e63656b4ec32f2391e9d54b3ebb6b addStr("erofs_sparse_flag", "-s") } - } - // Raise an exception if the propfile contains erofs properties, but the fstype is not erofs - if fs := fsTypeStr(f.fsType(ctx)); fs != "erofs" && (f.properties.Erofs.Compressor != nil || f.properties.Erofs.Compress_hints != nil || f.properties.Erofs.Sparse != nil) { + } else if f.properties.Erofs.Compressor != nil || f.properties.Erofs.Compress_hints != nil || f.properties.Erofs.Sparse != nil { + // Raise an exception if the propfile contains erofs properties, but the fstype is not erofs + fs := fsTypeStr(f.fsType(ctx)) ctx.PropertyErrorf("erofs", "erofs is non-empty, but FS type is %s\n. Please delete erofs properties if this partition should use %s\n", fs, fs) } |