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

Merge "release-config: use ${TARGET_RELEASE} for output" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-02 23:24:32 +00:00
committed by Gerrit Code Review
parent 814e80038b 897ab4e087
commit 0cc2749a4f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,19 +72,19 @@ func main() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
releaseName := config.Name
err = os.MkdirAll(outputDir, 0775) err = os.MkdirAll(outputDir, 0775)
if err != nil { if err != nil {
panic(err) panic(err)
} }
makefilePath := filepath.Join(outputDir, fmt.Sprintf("release_config-%s-%s.mk", product, releaseName)) makefilePath := filepath.Join(outputDir, fmt.Sprintf("release_config-%s-%s.mk", product, targetRelease))
useProto, ok := config.FlagArtifacts["RELEASE_BUILD_FLAGS_IN_PROTOBUF"] useProto, ok := config.FlagArtifacts["RELEASE_BUILD_FLAGS_IN_PROTOBUF"]
if guard && (!ok || rc_lib.MarshalValue(useProto.Value) == "") { if guard && (!ok || rc_lib.MarshalValue(useProto.Value) == "") {
// We were told to guard operation and either we have no build flag, or it is False. // We were told to guard operation and either we have no build flag, or it is False.
// Write an empty file so that release_config.mk will use the old process. // Write an empty file so that release_config.mk will use the old process.
os.WriteFile(makefilePath, []byte{}, 0644) os.WriteFile(makefilePath, []byte{}, 0644)
} else if allMake { } else if allMake {
// Write one makefile per release config, using the canonical release name.
for k, _ := range configs.ReleaseConfigs { for k, _ := range configs.ReleaseConfigs {
makefilePath = filepath.Join(outputDir, fmt.Sprintf("release_config-%s-%s.mk", product, k)) makefilePath = filepath.Join(outputDir, fmt.Sprintf("release_config-%s-%s.mk", product, k))
err = configs.WriteMakefile(makefilePath, k) err = configs.WriteMakefile(makefilePath, k)