Use hardlinks for Bazel's symlink actions
This prevents failures resulting from using `cp -d` on symlinks. Test: USE_BAZEL_ANAYSIS=1 m adbd Change-Id: Ic1756ffe407df81b0e99f99c50bee6af4ecf7796
This commit is contained in:
@@ -246,7 +246,8 @@ func AqueryBuildStatements(aqueryJsonProto []byte) ([]BuildStatement, error) {
|
||||
outDir := proptools.ShellEscapeIncludingSpaces(filepath.Dir(out))
|
||||
out = proptools.ShellEscapeIncludingSpaces(out)
|
||||
in := proptools.ShellEscapeIncludingSpaces(inputPaths[0])
|
||||
buildStatement.Command = fmt.Sprintf("mkdir -p %[1]s && rm -f %[2]s && ln -rsf %[3]s %[2]s", outDir, out, in)
|
||||
// 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)
|
||||
buildStatement.SymlinkPaths = outputPaths[:]
|
||||
} else if len(actionEntry.Arguments) < 1 {
|
||||
return nil, fmt.Errorf("received action with no command: [%v]", buildStatement)
|
||||
|
@@ -859,7 +859,7 @@ func TestSimpleSymlink(t *testing.T) {
|
||||
BuildStatement{
|
||||
Command: "mkdir -p one/symlink_subdir && " +
|
||||
"rm -f one/symlink_subdir/symlink && " +
|
||||
"ln -rsf one/file_subdir/file one/symlink_subdir/symlink",
|
||||
"ln -f 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,7 +923,7 @@ func TestSymlinkQuotesPaths(t *testing.T) {
|
||||
BuildStatement{
|
||||
Command: "mkdir -p 'one/symlink subdir' && " +
|
||||
"rm -f 'one/symlink subdir/symlink' && " +
|
||||
"ln -rsf 'one/file subdir/file' 'one/symlink subdir/symlink'",
|
||||
"ln -f '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"},
|
||||
|
Reference in New Issue
Block a user