Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a02a0d01 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ide9c7a6a,I706c1433 am: f8b85ded 

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

Change-Id: I66efa33e2ddc8546979b44498c91eff0fc3ee423
parents 586854a6 f8b85ded

android/module.go

+8 −1
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ type BuildParams struct { 
	Implicit        Path

	Implicits       Paths

	OrderOnly       Paths

	Validation      Path

	Validations     Paths

	Default         bool

	Args            map[string]string

}
@@ -1561,6 +1563,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,

	}
@@ -1580,13 +1583,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

}

ui/build/soong.go

+1 −1
Original line number Diff line number Diff line
@@ -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())