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

Merge "Compile soong_build for debugging if needed." am: 734b215d66

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1642103

Change-Id: Icdd146de55e8ac3fe78f20259b60cd82cea351a4
This commit is contained in:
Lukács T. Berki
2021-03-18 09:13:43 +00:00
committed by Automerger Merge Worker
parent 8a861d2148 734b215d66
commit 0a70e6f72c
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -73,6 +73,10 @@ func (c Config) NinjaBuildDir() string {
return c.buildDir
}
func (c Config) DebugCompilation() bool {
return false // Never compile Go code in the main build for debugging
}
func (c Config) SrcDir() string {
return c.srcDir
}

6
ui/build/soong.go
View File

@@ -68,6 +68,7 @@ type BlueprintConfig struct {
srcDir string
buildDir string
ninjaBuildDir string
debugCompilation bool
}
func (c BlueprintConfig) SrcDir() string {
@@ -82,6 +83,10 @@ func (c BlueprintConfig) NinjaBuildDir() string {
return c.ninjaBuildDir
}
func (c BlueprintConfig) DebugCompilation() bool {
return c.debugCompilation
}
func bootstrapBlueprint(ctx Context, config Config) {
ctx.BeginTrace(metrics.RunSoong, "blueprint bootstrap")
defer ctx.EndTrace()
@@ -105,6 +110,7 @@ func bootstrapBlueprint(ctx Context, config Config) {
srcDir: os.Getenv("TOP"),
buildDir: config.SoongOutDir(),
ninjaBuildDir: config.OutDir(),
debugCompilation: os.Getenv("SOONG_DELVE") != "",
}
bootstrap.RunBlueprint(args, blueprintCtx, blueprintConfig)