openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes Ide9c7a6a,I706c1433 am: f8b85dedde am: a02a0d012c 

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

Change-Id: I5fb0dafda5d1547c96b6196cfe6eecf4618a16be
This commit is contained in:
Treehugger Robot 2020-07-17 20:32:42 +00:00 committed by Automerger Merge Worker
parent 464e5f720c a02a0d012c
commit 7d1576540b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
android/module.go
View File

@ -50,6 +50,8 @@ type BuildParams struct {
Implicit Path
Implicits Paths
OrderOnly Paths
Validation Path
Validations Paths
Default bool
Args map[string]string
}
@ -1562,6 +1564,7 @@ func convertBuildParams(params BuildParams) blueprint.BuildParams {
Inputs: params.Inputs.Strings(),
Implicits: params.Implicits.Strings(),
OrderOnly: params.OrderOnly.Strings(),
Validations: params.Validations.Strings(),
Args: params.Args,
Optional: !params.Default,
}
@ -1581,13 +1584,17 @@ func convertBuildParams(params BuildParams) blueprint.BuildParams {
if params.Implicit != nil {
bparams.Implicits = append(bparams.Implicits, params.Implicit.String())
}
if params.Validation != nil {
bparams.Validations = append(bparams.Validations, params.Validation.String())
}
bparams.Outputs = proptools.NinjaEscapeList(bparams.Outputs)
bparams.ImplicitOutputs = proptools.NinjaEscapeList(bparams.ImplicitOutputs)
bparams.Inputs = proptools.NinjaEscapeList(bparams.Inputs)
bparams.Implicits = proptools.NinjaEscapeList(bparams.Implicits)
bparams.OrderOnly = proptools.NinjaEscapeList(bparams.OrderOnly)
bparams.Depfile = proptools.NinjaEscapeList([]string{bparams.Depfile})[0]
bparams.Validations = proptools.NinjaEscapeList(bparams.Validations)
bparams.Depfile = proptools.NinjaEscape(bparams.Depfile)
return bparams
}

2
ui/build/soong.go
View File

@ -38,7 +38,7 @@ func runSoong(ctx Context, config Config) {
ctx.BeginTrace(metrics.RunSoong, "blueprint bootstrap")
defer ctx.EndTrace()
cmd := Command(ctx, config, "blueprint bootstrap", "build/blueprint/bootstrap.bash", "-t")
cmd := Command(ctx, config, "blueprint bootstrap", "build/blueprint/bootstrap.bash", "-t", "-n")
cmd.Environment.Set("BLUEPRINTDIR", "./build/blueprint")
cmd.Environment.Set("BOOTSTRAP", "./build/blueprint/bootstrap.bash")
cmd.Environment.Set("BUILDDIR", config.SoongOutDir())