Merge "Add symlink_outputs support to Soong." (17958198) · Commits · e / os / android_build_soong

android/defs.go

+3 −2

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@ var (
		blueprint.RuleParams{
		Command: "rm -f $out && ln -f -s $fromPath $out",
		Description: "symlink $out",
		SymlinkOutputs: []string{"$out"},
		},
		"fromPath")

android/module.go

+37 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ type BuildParams struct {
		Description string
		Output WritablePath
		Outputs WritablePaths
		SymlinkOutput WritablePath
		SymlinkOutputs WritablePaths
		ImplicitOutput WritablePath
		ImplicitOutputs WritablePaths
		Input Path
		@@ -1763,6 +1765,27 @@ func (m *moduleContext) ModuleBuild(pctx PackageContext, params ModuleBuildParam
		m.Build(pctx, BuildParams(params))
		}

		func validateBuildParams(params blueprint.BuildParams) error {
		// Validate that the symlink outputs are declared outputs or implicit outputs
		allOutputs := map[string]bool{}
		for _, output := range params.Outputs {
		allOutputs[output] = true
		}
		for _, output := range params.ImplicitOutputs {
		allOutputs[output] = true
		}
		for _, symlinkOutput := range params.SymlinkOutputs {
		if !allOutputs[symlinkOutput] {
		return fmt.Errorf(
		"Symlink output %s is not a declared output or implicit output",
		symlinkOutput)
		}
		}
		return nil
		}

		// Convert build parameters from their concrete Android types into their string representations,
		// and combine the singular and plural fields of the same type (e.g. Output and Outputs).
		func convertBuildParams(params BuildParams) blueprint.BuildParams {
		bparams := blueprint.BuildParams{
		Rule: params.Rule,
		@@ -1770,6 +1793,7 @@ func convertBuildParams(params BuildParams) blueprint.BuildParams {
		Deps: params.Deps,
		Outputs: params.Outputs.Strings(),
		ImplicitOutputs: params.ImplicitOutputs.Strings(),
		SymlinkOutputs: params.SymlinkOutputs.Strings(),
		Inputs: params.Inputs.Strings(),
		Implicits: params.Implicits.Strings(),
		OrderOnly: params.OrderOnly.Strings(),
		@@ -1784,6 +1808,9 @@ func convertBuildParams(params BuildParams) blueprint.BuildParams {
		if params.Output != nil {
		bparams.Outputs = append(bparams.Outputs, params.Output.String())
		}
		if params.SymlinkOutput != nil {
		bparams.SymlinkOutputs = append(bparams.SymlinkOutputs, params.SymlinkOutput.String())
		}
		if params.ImplicitOutput != nil {
		bparams.ImplicitOutputs = append(bparams.ImplicitOutputs, params.ImplicitOutput.String())
		}
		@@ -1799,6 +1826,7 @@ func convertBuildParams(params BuildParams) blueprint.BuildParams {

		bparams.Outputs = proptools.NinjaEscapeList(bparams.Outputs)
		bparams.ImplicitOutputs = proptools.NinjaEscapeList(bparams.ImplicitOutputs)
		bparams.SymlinkOutputs = proptools.NinjaEscapeList(bparams.SymlinkOutputs)
		bparams.Inputs = proptools.NinjaEscapeList(bparams.Inputs)
		bparams.Implicits = proptools.NinjaEscapeList(bparams.Implicits)
		bparams.OrderOnly = proptools.NinjaEscapeList(bparams.OrderOnly)
		@@ -1855,7 +1883,15 @@ func (m *moduleContext) Build(pctx PackageContext, params BuildParams) {
		m.buildParams = append(m.buildParams, params)
		}

		m.bp.Build(pctx.PackageContext, convertBuildParams(params))
		bparams := convertBuildParams(params)
		err := validateBuildParams(bparams)
		if err != nil {
		m.ModuleErrorf(
		"%s: build parameter validation failed: %s",
		m.ModuleName(),
		err.Error())
		}
		m.bp.Build(pctx.PackageContext, bparams)
		}

		func (m *moduleContext) Phony(name string, deps ...Path) {

android/module_test.go

+46 −0

Original line number	Diff line number	Diff line
		@@ -187,3 +187,49 @@ func TestErrorDependsOnDisabledModule(t *testing.T) {
		_, errs = ctx.PrepareBuildActions(config)
		FailIfNoMatchingErrors(t, `module "foo": depends on disabled module "bar"`, errs)
		}

		func TestValidateCorrectBuildParams(t *testing.T) {
		config := TestConfig(buildDir, nil, "", nil)
		pathContext := PathContextForTesting(config)
		bparams := convertBuildParams(BuildParams{
		// Test with Output
		Output: PathForOutput(pathContext, "undeclared_symlink"),
		SymlinkOutput: PathForOutput(pathContext, "undeclared_symlink"),
		})

		err := validateBuildParams(bparams)
		if err != nil {
		t.Error(err)
		}

		bparams = convertBuildParams(BuildParams{
		// Test with ImplicitOutput
		ImplicitOutput: PathForOutput(pathContext, "undeclared_symlink"),
		SymlinkOutput: PathForOutput(pathContext, "undeclared_symlink"),
		})

		err = validateBuildParams(bparams)
		if err != nil {
		t.Error(err)
		}
		}

		func TestValidateIncorrectBuildParams(t *testing.T) {
		config := TestConfig(buildDir, nil, "", nil)
		pathContext := PathContextForTesting(config)
		params := BuildParams{
		Output: PathForOutput(pathContext, "regular_output"),
		Outputs: PathsForOutput(pathContext, []string{"out1", "out2"}),
		ImplicitOutput: PathForOutput(pathContext, "implicit_output"),
		ImplicitOutputs: PathsForOutput(pathContext, []string{"i_out1", "_out2"}),
		SymlinkOutput: PathForOutput(pathContext, "undeclared_symlink"),
		}

		bparams := convertBuildParams(params)
		err := validateBuildParams(bparams)
		if err != nil {
		FailIfNoMatchingErrors(t, "undeclared_symlink is not a declared output or implicit output", []error{err})
		} else {
		t.Errorf("Expected build params to fail validation: %+v", bparams)
		}
		}

android/rule_builder.go

+79 −8

Original line number	Diff line number	Diff line
		@@ -246,6 +246,41 @@ func (r *RuleBuilder) Outputs() WritablePaths {
		return outputList
		}

		func (r *RuleBuilder) symlinkOutputSet() map[string]WritablePath {
		symlinkOutputs := make(map[string]WritablePath)
		for _, c := range r.commands {
		for _, symlinkOutput := range c.symlinkOutputs {
		symlinkOutputs[symlinkOutput.String()] = symlinkOutput
		}
		}
		return symlinkOutputs
		}

		// SymlinkOutputs returns the list of paths that the executor (Ninja) would
		// verify, after build edge completion, that:
		//
		// 1) Created output symlinks match the list of paths in this list exactly (no more, no fewer)
		// 2) Created output files are not declared in this list.
		//
		// These symlink outputs are expected to be a subset of outputs or implicit
		// outputs, or they would fail validation at build param construction time
		// later, to support other non-rule-builder approaches for constructing
		// statements.
		func (r *RuleBuilder) SymlinkOutputs() WritablePaths {
		symlinkOutputs := r.symlinkOutputSet()

		var symlinkOutputList WritablePaths
		for _, symlinkOutput := range symlinkOutputs {
		symlinkOutputList = append(symlinkOutputList, symlinkOutput)
		}

		sort.Slice(symlinkOutputList, func(i, j int) bool {
		return symlinkOutputList[i].String() < symlinkOutputList[j].String()
		})

		return symlinkOutputList
		}

		func (r *RuleBuilder) depFileSet() map[string]WritablePath {
		depFiles := make(map[string]WritablePath)
		for _, c := range r.commands {
		@@ -467,6 +502,7 @@ func (r *RuleBuilder) Build(pctx PackageContext, ctx BuilderContext, name string
		Implicits: r.Inputs(),
		Output: output,
		ImplicitOutputs: implicitOutputs,
		SymlinkOutputs: r.SymlinkOutputs(),
		Depfile: depFile,
		Deps: depFormat,
		Description: desc,
		@@ -483,6 +519,7 @@ type RuleBuilderCommand struct {
		implicits Paths
		orderOnlys Paths
		outputs WritablePaths
		symlinkOutputs WritablePaths
		depFiles WritablePaths
		tools Paths
		rspFileInputs Paths
		@@ -715,6 +752,40 @@ func (c RuleBuilderCommand) ImplicitOutputs(paths WritablePaths) RuleBuilderCo
		return c
		}

		// ImplicitSymlinkOutput declares the specified path as an implicit output that
		// will be a symlink instead of a regular file. Does not modify the command
		// line.
		func (c RuleBuilderCommand) ImplicitSymlinkOutput(path WritablePath) RuleBuilderCommand {
		c.symlinkOutputs = append(c.symlinkOutputs, path)
		return c.ImplicitOutput(path)
		}

		// ImplicitSymlinkOutputs declares the specified paths as implicit outputs that
		// will be a symlinks instead of regular files. Does not modify the command
		// line.
		func (c RuleBuilderCommand) ImplicitSymlinkOutputs(paths WritablePaths) RuleBuilderCommand {
		for _, path := range paths {
		c.ImplicitSymlinkOutput(path)
		}
		return c
		}

		// SymlinkOutput declares the specified path as an output that will be a symlink
		// instead of a regular file. Modifies the command line.
		func (c RuleBuilderCommand) SymlinkOutput(path WritablePath) RuleBuilderCommand {
		c.symlinkOutputs = append(c.symlinkOutputs, path)
		return c.Output(path)
		}

		// SymlinkOutputsl declares the specified paths as outputs that will be symlinks
		// instead of regular files. Modifies the command line.
		func (c RuleBuilderCommand) SymlinkOutputs(paths WritablePaths) RuleBuilderCommand {
		for _, path := range paths {
		c.SymlinkOutput(path)
		}
		return c
		}

		// ImplicitDepFile adds the specified depfile path to the paths returned by RuleBuilder.DepFiles without modifying
		// the command line, and causes RuleBuilder.Build file to set the depfile flag for ninja. If multiple depfiles
		// are added to commands in a single RuleBuilder then RuleBuilder.Build will add an extra command to merge the

android/rule_builder_test.go

+36 −3

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ func pathContext() PathContext {
		"a": nil,
		"b": nil,
		"ls": nil,
		"ln": nil,
		"turbine": nil,
		"java": nil,
		"javac": nil,
		@@ -67,6 +68,32 @@ func ExampleRuleBuilder() {
		// outputs: ["out/linked"]
		}

		func ExampleRuleBuilder_SymlinkOutputs() {
		rule := NewRuleBuilder()

		ctx := pathContext()

		rule.Command().
		Tool(PathForSource(ctx, "ln")).
		FlagWithInput("-s ", PathForTesting("a.o")).
		SymlinkOutput(PathForOutput(ctx, "a"))
		rule.Command().Text("cp out/a out/b").
		ImplicitSymlinkOutput(PathForOutput(ctx, "b"))

		fmt.Printf("commands: %q\n", strings.Join(rule.Commands(), " && "))
		fmt.Printf("tools: %q\n", rule.Tools())
		fmt.Printf("inputs: %q\n", rule.Inputs())
		fmt.Printf("outputs: %q\n", rule.Outputs())
		fmt.Printf("symlink_outputs: %q\n", rule.SymlinkOutputs())

		// Output:
		// commands: "ln -s a.o out/a && cp out/a out/b"
		// tools: ["ln"]
		// inputs: ["a.o"]
		// outputs: ["out/a" "out/b"]
		// symlink_outputs: ["out/a" "out/b"]
		}

		func ExampleRuleBuilder_Temporary() {
		rule := NewRuleBuilder()

		@@ -293,6 +320,8 @@ func TestRuleBuilder(t *testing.T) {
		Input(PathForSource(ctx, "Input")).
		Output(PathForOutput(ctx, "Output")).
		OrderOnly(PathForSource(ctx, "OrderOnly")).
		SymlinkOutput(PathForOutput(ctx, "SymlinkOutput")).
		ImplicitSymlinkOutput(PathForOutput(ctx, "ImplicitSymlinkOutput")).
		Text("Text").
		Tool(PathForSource(ctx, "Tool"))

		@@ -318,17 +347,18 @@ func TestRuleBuilder(t *testing.T) {
		}

		wantInputs := PathsForSource(ctx, []string{"Implicit", "Input", "input", "input2", "input3"})
		wantOutputs := PathsForOutput(ctx, []string{"ImplicitOutput", "Output", "output", "output2", "output3"})
		wantOutputs := PathsForOutput(ctx, []string{"ImplicitOutput", "ImplicitSymlinkOutput", "Output", "SymlinkOutput", "output", "output2", "output3"})
		wantDepFiles := PathsForOutput(ctx, []string{"DepFile", "depfile", "ImplicitDepFile", "depfile2"})
		wantTools := PathsForSource(ctx, []string{"Tool", "tool2"})
		wantOrderOnlys := PathsForSource(ctx, []string{"OrderOnly", "OrderOnlys"})
		wantSymlinkOutputs := PathsForOutput(ctx, []string{"ImplicitSymlinkOutput", "SymlinkOutput"})

		t.Run("normal", func(t *testing.T) {
		rule := NewRuleBuilder()
		addCommands(rule)

		wantCommands := []string{
		"out/DepFile Flag FlagWithArg=arg FlagWithDepFile=out/depfile FlagWithInput=input FlagWithOutput=out/output Input out/Output Text Tool after command2 old cmd",
		"out/DepFile Flag FlagWithArg=arg FlagWithDepFile=out/depfile FlagWithInput=input FlagWithOutput=out/output Input out/Output out/SymlinkOutput Text Tool after command2 old cmd",
		"command2 out/depfile2 input2 out/output2 tool2",
		"command3 input3 out/output2 out/output3",
		}
		@@ -345,6 +375,9 @@ func TestRuleBuilder(t *testing.T) {
		if g, w := rule.Outputs(), wantOutputs; !reflect.DeepEqual(w, g) {
		t.Errorf("\nwant rule.Outputs() = %#v\n got %#v", w, g)
		}
		if g, w := rule.SymlinkOutputs(), wantSymlinkOutputs; !reflect.DeepEqual(w, g) {
		t.Errorf("\nwant rule.SymlinkOutputs() = %#v\n got %#v", w, g)
		}
		if g, w := rule.DepFiles(), wantDepFiles; !reflect.DeepEqual(w, g) {
		t.Errorf("\nwant rule.DepFiles() = %#v\n got %#v", w, g)
		}
		@@ -365,7 +398,7 @@ func TestRuleBuilder(t *testing.T) {
		addCommands(rule)

		wantCommands := []string{
		"__SBOX_OUT_DIR__/DepFile Flag FlagWithArg=arg FlagWithDepFile=__SBOX_OUT_DIR__/depfile FlagWithInput=input FlagWithOutput=__SBOX_OUT_DIR__/output Input __SBOX_OUT_DIR__/Output Text Tool after command2 old cmd",
		"__SBOX_OUT_DIR__/DepFile Flag FlagWithArg=arg FlagWithDepFile=__SBOX_OUT_DIR__/depfile FlagWithInput=input FlagWithOutput=__SBOX_OUT_DIR__/output Input __SBOX_OUT_DIR__/Output __SBOX_OUT_DIR__/SymlinkOutput Text Tool after command2 old cmd",
		"command2 __SBOX_OUT_DIR__/depfile2 input2 __SBOX_OUT_DIR__/output2 tool2",
		"command3 input3 __SBOX_OUT_DIR__/output2 __SBOX_OUT_DIR__/output3",
		}