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

Remove Srcdir() from BootstrapConfig.

Browse Source 
It was always ".".

Test: Presubmits.
Change-Id: I5381002b3f2986122f1b335a88119cead0a86d75
This commit is contained in:
Lukacs T. Berki
2021-08-16 17:05:09 +02:00
parent f9008075d9
commit f7e36d80ff
4 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/soong_build/main.go
View File

@@ -107,8 +107,8 @@ func newContext(configuration android.Config, prepareBuildActions bool) *android
return ctx
}
func newConfig(srcDir, outDir string, availableEnv map[string]string) android.Config {
configuration, err := android.NewConfig(srcDir, outDir, cmdlineArgs.ModuleListFile, availableEnv)
func newConfig(outDir string, availableEnv map[string]string) android.Config {
configuration, err := android.NewConfig(outDir, cmdlineArgs.ModuleListFile, availableEnv)
if err != nil {
fmt.Fprintf(os.Stderr, "%s", err)
os.Exit(1)
@@ -273,9 +273,7 @@ func main() {
availableEnv := parseAvailableEnv()
// The top-level Blueprints file is passed as the first argument.
srcDir := filepath.Dir(flag.Arg(0))
configuration := newConfig(srcDir, outDir, availableEnv)
configuration := newConfig(outDir, availableEnv)
extraNinjaDeps := []string{
configuration.ProductVariablesFileName,
usedEnvFile,
@@ -469,7 +467,7 @@ func runBp2Build(configuration android.Config, extraNinjaDeps []string) {
// configurations or variables, since those will generate different BUILD
// files based on how the user has configured their tree.
bp2buildCtx.SetModuleListFile(cmdlineArgs.ModuleListFile)
modulePaths, err := bp2buildCtx.ListModulePaths(configuration.SrcDir())
modulePaths, err := bp2buildCtx.ListModulePaths(".")
if err != nil {
panic(err)
}
@@ -526,7 +524,7 @@ func runBp2Build(configuration android.Config, extraNinjaDeps []string) {
excludes = append(excludes, getTemporaryExcludes()...)
symlinkForestDeps := bp2build.PlantSymlinkForest(
topDir, workspaceRoot, generatedRoot, configuration.SrcDir(), excludes)
topDir, workspaceRoot, generatedRoot, ".", excludes)
// Only report metrics when in bp2build mode. The metrics aren't relevant
// for queryview, since that's a total repo-wide conversion and there's a