diff options
| author | 2025-01-21 08:10:08 +0100 | |
|---|---|---|
| committer | 2025-01-24 13:53:04 +0100 | |
| commit | eeea6b41d6d9dc1612aa41b092eed55d68053a8d (patch) | |
| tree | cc4ef39976865de18f51c4a95ceff551858cc654 /aconfig/all_aconfig_declarations.go | |
| parent | 68548906d74db932966a272afb82332c543386f8 (diff) | |
record-finalized-flags: pass in list of finalized flags
record-finalized-flags needs the list of already finalized flags (soong
module "finalized-flags") to correctly generate the full list of
finalized flags for the next API finalization.
Bug: 377676163
Test: m sdk dist # and manually inspect out/dist/finalized-flags.txt
Merged-In: Ie1d52b90f3acad134e4a5e71c112b9724888e25f
Change-Id: Ie1d52b90f3acad134e4a5e71c112b9724888e25f
Diffstat (limited to 'aconfig/all_aconfig_declarations.go')
| -rw-r--r-- | aconfig/all_aconfig_declarations.go | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/aconfig/all_aconfig_declarations.go b/aconfig/all_aconfig_declarations.go index 9086c9306..ec200997e 100644 --- a/aconfig/all_aconfig_declarations.go +++ b/aconfig/all_aconfig_declarations.go @@ -43,7 +43,8 @@ type allAconfigReleaseDeclarationsSingleton struct { } type allAconfigReleaseDeclarationsProperties struct { - Api_files proptools.Configurable[[]string] `android:"arch_variant,path"` + Api_signature_files proptools.Configurable[[]string] `android:"arch_variant,path"` + Finalized_flags_file string `android:"arch_variant,path"` } type allAconfigDeclarationsSingleton struct { @@ -63,23 +64,25 @@ func (this *allAconfigDeclarationsSingleton) sortedConfigNames() []string { } func (this *allAconfigDeclarationsSingleton) GenerateAndroidBuildActions(ctx android.ModuleContext) { - apiFiles := android.Paths{} - for _, apiFile := range this.properties.Api_files.GetOrDefault(ctx, nil) { - if path := android.PathForModuleSrc(ctx, apiFile); path != nil { - apiFiles = append(apiFiles, path) + apiSignatureFiles := android.Paths{} + for _, apiSignatureFile := range this.properties.Api_signature_files.GetOrDefault(ctx, nil) { + if path := android.PathForModuleSrc(ctx, apiSignatureFile); path != nil { + apiSignatureFiles = append(apiSignatureFiles, path) } } - flagFile := android.PathForIntermediates(ctx, "all_aconfig_declarations.pb") + finalizedFlagsFile := android.PathForModuleSrc(ctx, this.properties.Finalized_flags_file) + parsedFlagsFile := android.PathForIntermediates(ctx, "all_aconfig_declarations.pb") output := android.PathForIntermediates(ctx, "finalized-flags.txt") ctx.Build(pctx, android.BuildParams{ Rule: RecordFinalizedFlagsRule, - Inputs: append(apiFiles, flagFile), + Inputs: append(apiSignatureFiles, finalizedFlagsFile, parsedFlagsFile), Output: output, Args: map[string]string{ - "api_files": android.JoinPathsWithPrefix(apiFiles, "--api-file "), - "flag_file": "--flag-file " + flagFile.String(), + "api_signature_files": android.JoinPathsWithPrefix(apiSignatureFiles, "--api-signature-file "), + "finalized_flags_file": "--finalized-flags-file " + finalizedFlagsFile.String(), + "parsed_flags_file": "--parsed-flags-file " + parsedFlagsFile.String(), }, }) ctx.Phony("all_aconfig_declarations", output) |