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

Merge "Build build_flags.json in soong" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-29 00:18:16 +00:00
committed by Gerrit Code Review
parent 1705676dd0 5f53869dfe
commit 89341ed9ad
5 changed files with 78 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/release_config/release_config/main.go
View File

@@ -120,7 +120,7 @@ func main() {
panic(err)
}
}
if err = config.WritePartitionBuildFlags(outputDir, product, targetRelease); err != nil {
if err = config.WritePartitionBuildFlags(outputDir); err != nil {
panic(err)
}

6
cmd/release_config/release_config_lib/release_config.go
View File

@@ -284,13 +284,15 @@ func (config *ReleaseConfig) GenerateReleaseConfig(configs *ReleaseConfigs) erro
return nil
}
func (config *ReleaseConfig) WritePartitionBuildFlags(outDir, product, targetRelease string) error {
func (config *ReleaseConfig) WritePartitionBuildFlags(outDir string) error {
var err error
for partition, flags := range config.PartitionBuildFlags {
slices.SortFunc(flags.FlagArtifacts, func(a, b *rc_proto.FlagArtifact) int {
return cmp.Compare(*a.FlagDeclaration.Name, *b.FlagDeclaration.Name)
})
if err = WriteMessage(filepath.Join(outDir, fmt.Sprintf("build_flags_%s-%s-%s.json", partition, config.Name, product)), flags); err != nil {
// The json file name must not be modified as this is read from
// build_flags_json module
if err = WriteMessage(filepath.Join(outDir, fmt.Sprintf("build_flags_%s.json", partition)), flags); err != nil {
return err
}
}