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

Merge "Rename build.ninja with product name"

Browse Source
This commit is contained in:
Kiyoung Kim
2023-05-30 07:17:08 +00:00
committed by Gerrit Code Review
parent 30d48351be a37d9baa96
commit 5500fc89c1
4 changed files with 91 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
ui/build/config.go
View File

@@ -1229,6 +1229,13 @@ func (c *configImpl) TargetProduct() string {
panic("TARGET_PRODUCT is not defined")
}
func (c *configImpl) TargetProductOrErr() (string, error) {
if v, ok := c.environ.Get("TARGET_PRODUCT"); ok {
return v, nil
}
return "", fmt.Errorf("TARGET_PRODUCT is not defined")
}
func (c *configImpl) TargetDevice() string {
return c.targetDevice
}
@@ -1554,11 +1561,21 @@ func (c *configImpl) KatiPackageNinjaFile() string {
}
func (c *configImpl) SoongVarsFile() string {
return filepath.Join(c.SoongOutDir(), "soong.variables")
targetProduct, err := c.TargetProductOrErr()
if err != nil {
return filepath.Join(c.SoongOutDir(), "soong.variables")
} else {
return filepath.Join(c.SoongOutDir(), "soong."+targetProduct+".variables")
}
}
func (c *configImpl) SoongNinjaFile() string {
return filepath.Join(c.SoongOutDir(), "build.ninja")
targetProduct, err := c.TargetProductOrErr()
if err != nil {
return filepath.Join(c.SoongOutDir(), "build.ninja")
} else {
return filepath.Join(c.SoongOutDir(), "build."+targetProduct+".ninja")
}
}
func (c *configImpl) CombinedNinjaFile() string {

70
ui/build/soong.go
View File

@@ -235,7 +235,7 @@ func bootstrapEpochCleanup(ctx Context, config Config) {
} else if !exists {
// The tree is out of date for the current epoch, delete files used by bootstrap
// and force the primary builder to rerun.
os.Remove(filepath.Join(config.SoongOutDir(), "build.ninja"))
os.Remove(config.SoongNinjaFile())
for _, globFile := range bootstrapGlobFileList(config) {
os.Remove(globFile)
}
@@ -263,7 +263,9 @@ func bootstrapBlueprint(ctx Context, config Config) {
// Clean up some files for incremental builds across incompatible changes.
bootstrapEpochCleanup(ctx, config)
mainSoongBuildExtraArgs := []string{"-o", config.SoongNinjaFile()}
baseArgs := []string{"--soong_variables", config.SoongVarsFile()}
mainSoongBuildExtraArgs := append(baseArgs, "-o", config.SoongNinjaFile())
if config.EmptyNinjaFile() {
mainSoongBuildExtraArgs = append(mainSoongBuildExtraArgs, "--empty-ninja-file")
}
@@ -306,49 +308,59 @@ func bootstrapBlueprint(ctx Context, config Config) {
specificArgs: mainSoongBuildExtraArgs,
},
{
name: bp2buildFilesTag,
description: fmt.Sprintf("converting Android.bp files to BUILD files at %s/bp2build", config.SoongOutDir()),
config: config,
output: config.Bp2BuildFilesMarkerFile(),
specificArgs: []string{"--bp2build_marker", config.Bp2BuildFilesMarkerFile()},
name: bp2buildFilesTag,
description: fmt.Sprintf("converting Android.bp files to BUILD files at %s/bp2build", config.SoongOutDir()),
config: config,
output: config.Bp2BuildFilesMarkerFile(),
specificArgs: append(baseArgs,
"--bp2build_marker", config.Bp2BuildFilesMarkerFile(),
),
},
{
name: bp2buildWorkspaceTag,
description: "Creating Bazel symlink forest",
config: config,
output: config.Bp2BuildWorkspaceMarkerFile(),
specificArgs: []string{"--symlink_forest_marker", config.Bp2BuildWorkspaceMarkerFile()},
name: bp2buildWorkspaceTag,
description: "Creating Bazel symlink forest",
config: config,
output: config.Bp2BuildWorkspaceMarkerFile(),
specificArgs: append(baseArgs,
"--symlink_forest_marker", config.Bp2BuildWorkspaceMarkerFile(),
),
},
{
name: jsonModuleGraphTag,
description: fmt.Sprintf("generating the Soong module graph at %s", config.ModuleGraphFile()),
config: config,
output: config.ModuleGraphFile(),
specificArgs: []string{
specificArgs: append(baseArgs,
"--module_graph_file", config.ModuleGraphFile(),
"--module_actions_file", config.ModuleActionsFile(),
},
),
},
{
name: queryviewTag,
description: fmt.Sprintf("generating the Soong module graph as a Bazel workspace at %s", queryviewDir),
config: config,
output: config.QueryviewMarkerFile(),
specificArgs: []string{"--bazel_queryview_dir", queryviewDir},
name: queryviewTag,
description: fmt.Sprintf("generating the Soong module graph as a Bazel workspace at %s", queryviewDir),
config: config,
output: config.QueryviewMarkerFile(),
specificArgs: append(baseArgs,
"--bazel_queryview_dir", queryviewDir,
),
},
{
name: apiBp2buildTag,
description: fmt.Sprintf("generating BUILD files for API contributions at %s", apiBp2buildDir),
config: config,
output: config.ApiBp2buildMarkerFile(),
specificArgs: []string{"--bazel_api_bp2build_dir", apiBp2buildDir},
name: apiBp2buildTag,
description: fmt.Sprintf("generating BUILD files for API contributions at %s", apiBp2buildDir),
config: config,
output: config.ApiBp2buildMarkerFile(),
specificArgs: append(baseArgs,
"--bazel_api_bp2build_dir", apiBp2buildDir,
),
},
{
name: soongDocsTag,
description: fmt.Sprintf("generating Soong docs at %s", config.SoongDocsHtml()),
config: config,
output: config.SoongDocsHtml(),
specificArgs: []string{"--soong_docs", config.SoongDocsHtml()},
name: soongDocsTag,
description: fmt.Sprintf("generating Soong docs at %s", config.SoongDocsHtml()),
config: config,
output: config.SoongDocsHtml(),
specificArgs: append(baseArgs,
"--soong_docs", config.SoongDocsHtml(),
),
},
}