StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make buildinfo_prop depend on build number file" into main am: daba74e728

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118317

Change-Id: Ie2384c5cca28355b3a10ec42514a5db965e7b0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2024-06-07 17:40:56 +00:00
committed by Automerger Merge Worker
parent 861d7b55a2 daba74e728
commit a256b1a485
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/buildinfo_prop.go
View File

@@ -111,10 +111,11 @@ func (p *buildinfoPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
cmd.FlagWithArg("--build-id=", config.BuildId()) cmd.FlagWithArg("--build-id=", config.BuildId())
cmd.FlagWithArg("--build-keys=", config.BuildKeys()) cmd.FlagWithArg("--build-keys=", config.BuildKeys())
// shouldn't depend on BuildNumberFile and BuildThumbprintFile to prevent from rebuilding // Note: depending on BuildNumberFile will cause the build.prop file to be rebuilt
// on every incremental build. // every build, but that's intentional.
cmd.FlagWithArg("--build-number-file=", config.BuildNumberFile(ctx).String()) cmd.FlagWithInput("--build-number-file=", config.BuildNumberFile(ctx))
if shouldAddBuildThumbprint(config) { if shouldAddBuildThumbprint(config) {
// In the previous make implementation, a dependency was not added on the thumbprint file
cmd.FlagWithArg("--build-thumbprint-file=", config.BuildThumbprintFile(ctx).String()) cmd.FlagWithArg("--build-thumbprint-file=", config.BuildThumbprintFile(ctx).String())
} }
@@ -123,8 +124,10 @@ func (p *buildinfoPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
cmd.FlagWithArg("--build-variant=", buildVariant) cmd.FlagWithArg("--build-variant=", buildVariant)
cmd.FlagForEachArg("--cpu-abis=", config.DeviceAbi()) cmd.FlagForEachArg("--cpu-abis=", config.DeviceAbi())
// shouldn't depend on BUILD_DATETIME_FILE to prevent from rebuilding on every incremental // Technically we should also have a dependency on BUILD_DATETIME_FILE,
// build. // but it can be either an absolute or relative path, which is hard to turn into
// a Path object. So just rely on the BuildNumberFile always changing to cause
// us to rebuild.
cmd.FlagWithArg("--date-file=", ctx.Config().Getenv("BUILD_DATETIME_FILE")) cmd.FlagWithArg("--date-file=", ctx.Config().Getenv("BUILD_DATETIME_FILE"))
if len(config.ProductLocales()) > 0 { if len(config.ProductLocales()) > 0 {