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

all_flags.pb: Properly handle intermediate files

Browse Source 
Bug: 343203557
Test: manual, TH
Ignore-AOSP-First: cherry-pick
Merged-In: I9a4ef39b0c2a641ccd996187ce5f7629520dffc0
Change-Id: I9a4ef39b0c2a641ccd996187ce5f7629520dffc0
This commit is contained in:
LaMont Jones
2024-05-28 13:23:01 -07:00
parent a2cbf72b2a
commit 4ba41f0eff
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/release_config/build_flag_declarations/main.go
View File

@@ -6,6 +6,7 @@ import (
"os"
rc_lib "android/soong/cmd/release_config/release_config_lib"
rc_proto "android/soong/cmd/release_config/release_config_proto"
)
type Flags struct {
@@ -62,18 +63,17 @@ func main() {
}
flagArtifacts := rc_lib.FlagArtifactsFactory("")
intermediates := []*rc_proto.FlagDeclarationArtifacts{}
for _, intermediate := range flags.intermediates {
fas := rc_lib.FlagArtifactsFactory(intermediate)
for _, fa := range *fas {
(*flagArtifacts)[*fa.FlagDeclaration.Name] = fa
}
fda := rc_lib.FlagDeclarationArtifactsFactory(intermediate)
intermediates = append(intermediates, fda)
}
for _, decl := range flags.decls {
fa := rc_lib.FlagArtifactFactory(decl)
(*flagArtifacts)[*fa.FlagDeclaration.Name] = fa
}
message := flagArtifacts.GenerateFlagDeclarationArtifacts()
message := flagArtifacts.GenerateFlagDeclarationArtifacts(intermediates)
err = rc_lib.WriteFormattedMessage(flags.output, flags.format, message)
if err != nil {
errorExit(err)