summaryrefslogtreecommitdiff
path: root/filesystem/filesystem.go
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2024-12-16 10:47:26 -0800
committer Cole Faust <colefaust@google.com> 2024-12-16 10:47:26 -0800
commitefeb5c4f29c85319db1c965afc39ecec4bc975b8 (patch)
treeab046eae36e0a0523bc06aff560ca6035757b19e /filesystem/filesystem.go
parent797e31e4fc8d1f207732625cdea671d72a6beabc (diff)
Remove dep on fingerprint file
So that microdroid doesn't get different contents every build. Fixes: 383555703 Test: diff 2 builds of m microdroid Change-Id: If974fdae39008d7cdc0e408114809d1a14efe629
Diffstat (limited to 'filesystem/filesystem.go')
-rw-r--r--filesystem/filesystem.go10
1 files changed, 6 insertions, 4 deletions
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go
index 4799d0dda..7ffdf69a9 100644
--- a/filesystem/filesystem.go
+++ b/filesystem/filesystem.go
@@ -696,6 +696,9 @@ func (f *filesystem) buildPropFile(ctx android.ModuleContext) (android.Path, and
avb_add_hashtree_footer_args += " --rollback_index " + strconv.Itoa(rollbackIndex)
}
avb_add_hashtree_footer_args += fmt.Sprintf(" --prop com.android.build.%s.os_version:%s", f.partitionName(), ctx.Config().PlatformVersionLastStable())
+ // We're not going to add BuildFingerPrintFile as a dep. If it changed, it's likely because
+ // the build number changed, and we don't want to trigger rebuilds solely based on the build
+ // number.
avb_add_hashtree_footer_args += fmt.Sprintf(" --prop com.android.build.%s.fingerprint:{CONTENTS_OF:%s}", f.partitionName(), ctx.Config().BuildFingerprintFile(ctx))
if f.properties.Security_patch != nil && proptools.String(f.properties.Security_patch) != "" {
avb_add_hashtree_footer_args += fmt.Sprintf(" --prop com.android.build.%s.security_patch:%s", f.partitionName(), proptools.String(f.properties.Security_patch))
@@ -753,10 +756,9 @@ func (f *filesystem) buildPropFile(ctx android.ModuleContext) (android.Path, and
android.WriteFileRuleVerbatim(ctx, propFilePreProcessing, propFileString.String())
propFile := android.PathForModuleOut(ctx, "prop")
ctx.Build(pctx, android.BuildParams{
- Rule: textFileProcessorRule,
- Input: propFilePreProcessing,
- Output: propFile,
- Implicit: ctx.Config().BuildFingerprintFile(ctx),
+ Rule: textFileProcessorRule,
+ Input: propFilePreProcessing,
+ Output: propFile,
})
return propFile, deps
}