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

Commit 17acadbc authored by Liz Kammer's avatar Liz Kammer Committed by Gerrit Code Review
Browse files

Merge "Make bazel action symlinks absolute paths"

parents 51ade343 c773778b

bazel/aquery.go

+3 −3
Original line number Diff line number Diff line
@@ -245,9 +245,9 @@ func AqueryBuildStatements(aqueryJsonProto []byte) ([]BuildStatement, error) { 
			out := outputPaths[0]

			outDir := proptools.ShellEscapeIncludingSpaces(filepath.Dir(out))

			out = proptools.ShellEscapeIncludingSpaces(out)

			in := proptools.ShellEscapeIncludingSpaces(inputPaths[0])

			// Use hard links, because some soong actions expect real files (for example, `cp -d`).

			buildStatement.Command = fmt.Sprintf("mkdir -p %[1]s && rm -f %[2]s && ln -f %[3]s %[2]s", outDir, out, in)

			in := filepath.Join("$PWD", proptools.ShellEscapeIncludingSpaces(inputPaths[0]))

			// Use absolute paths, because some soong actions don't play well with relative paths (for example, `cp -d`).

			buildStatement.Command = fmt.Sprintf("mkdir -p %[1]s && rm -f %[2]s && ln -sf %[3]s %[2]s", outDir, out, in)

			buildStatement.SymlinkPaths = outputPaths[:]

		} else if len(actionEntry.Arguments) < 1 {

			return nil, fmt.Errorf("received action with no command: [%v]", buildStatement)

bazel/aquery_test.go

+3 −3
Original line number Diff line number Diff line
@@ -859,7 +859,7 @@ func TestSimpleSymlink(t *testing.T) { 
		BuildStatement{

			Command: "mkdir -p one/symlink_subdir && " +

				"rm -f one/symlink_subdir/symlink && " +

				"ln -f one/file_subdir/file one/symlink_subdir/symlink",

				"ln -sf $PWD/one/file_subdir/file one/symlink_subdir/symlink",

			InputPaths:   []string{"one/file_subdir/file"},

			OutputPaths:  []string{"one/symlink_subdir/symlink"},

			SymlinkPaths: []string{"one/symlink_subdir/symlink"},
@@ -923,14 +923,14 @@ func TestSymlinkQuotesPaths(t *testing.T) { 
		BuildStatement{

			Command: "mkdir -p 'one/symlink subdir' && " +

				"rm -f 'one/symlink subdir/symlink' && " +

				"ln -f 'one/file subdir/file' 'one/symlink subdir/symlink'",

				"ln -sf $PWD/'one/file subdir/file' 'one/symlink subdir/symlink'",

			InputPaths:   []string{"one/file subdir/file"},

			OutputPaths:  []string{"one/symlink subdir/symlink"},

			SymlinkPaths: []string{"one/symlink subdir/symlink"},

			Mnemonic:     "SolibSymlink",

		},

	}

	assertBuildStatements(t, actual, expectedBuildStatements)

	assertBuildStatements(t, expectedBuildStatements, actual)

}



func TestSymlinkMultipleInputs(t *testing.T) {