From 6e17ad5937308ef6b3acdc3d184a18f964e16653 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 16 Jul 2020 13:05:03 -0700 Subject: [PATCH 1/2] Use validations for blueprint tests Pass -n to blueprint to make it use validation dependencies for tests, which will let them run in parallel with soong_build. Bug: 156428456 Test: m nothing Change-Id: I706c14330543e2a7728e5dc385976900c67cb2f5 --- ui/build/soong.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/build/soong.go b/ui/build/soong.go index 749acb3d5..fb2143011 100644 --- a/ui/build/soong.go +++ b/ui/build/soong.go @@ -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()) From 824f11614ee61c6cdf21169dcb799ded781e3d8d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 16 Jul 2020 13:07:51 -0700 Subject: [PATCH 2/2] Add Validations to android.BuildParams Pass Validations through to blueprint. Test: m checkbuild Change-Id: Ide9c7a6afe627277df09a9e594849a971916f044 --- android/module.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/android/module.go b/android/module.go index 06079cae9..10b479fc4 100644 --- a/android/module.go +++ b/android/module.go @@ -50,6 +50,8 @@ type BuildParams struct { Implicit Path Implicits Paths OrderOnly Paths + Validation Path + Validations Paths Default bool Args map[string]string } @@ -1549,6 +1551,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, } @@ -1568,13 +1571,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 }