diff options
| author | 2025-01-17 14:03:40 -0800 | |
|---|---|---|
| committer | 2025-01-17 14:03:40 -0800 | |
| commit | 4c6323c89ab6a21ff701d37626f6b8fe834a7e7c (patch) | |
| tree | 47ab9cef83508e58025cfd08ac6a921735c188b0 /filesystem/filesystem.go | |
| parent | 6cd307d3d1f5abdb4b9ba6b33f023f180f959ffd (diff) | |
| parent | 0c1a68b511ada4997e1db607087adebe6ea8abfd (diff) | |
Merge "Generate block_list only when building img for target_files.zip" into main
Diffstat (limited to 'filesystem/filesystem.go')
| -rw-r--r-- | filesystem/filesystem.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 822ba43ad..cf38bfdad 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -709,7 +709,9 @@ func (f *filesystem) buildImageUsingBuildImage( // Add an additional cmd to create a hermetic img file. This will contain pinned timestamps e.g. propFilePinnedTimestamp := android.PathForModuleOut(ctx, "for_target_files", "prop") - builder.Command().Textf("cat").Input(propFile).Flag(">").Output(propFilePinnedTimestamp).Textf(" && echo use_fixed_timestamp=true >> %s", propFilePinnedTimestamp) + builder.Command().Textf("cat").Input(propFile).Flag(">").Output(propFilePinnedTimestamp). + Textf(" && echo use_fixed_timestamp=true >> %s", propFilePinnedTimestamp). + Textf(" && echo block_list=%s >> %s", f.getMapFile(ctx).String(), propFilePinnedTimestamp) // mapfile will be an implicit output outputHermetic := android.PathForModuleOut(ctx, "for_target_files", f.installFileName()) builder.Command(). @@ -769,7 +771,6 @@ func (f *filesystem) buildPropFile(ctx android.ModuleContext) (android.Path, and } panic(fmt.Errorf("unsupported fs type %v", t)) } - addStr("block_list", f.getMapFile(ctx).String()) // This will be an implicit output addStr("fs_type", fsTypeStr(f.fsType(ctx))) addStr("mount_point", proptools.StringDefault(f.properties.Mount_point, "/")) |