From d80b3c82189b61eb79303937eec38beabcd3f35a Mon Sep 17 00:00:00 2001 From: Chris Parsons Date: Thu, 14 Oct 2021 15:24:05 -0400 Subject: [PATCH] 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 --- bazel/aquery.go | 3 ++- bazel/aquery_test.go | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bazel/aquery.go b/bazel/aquery.go index 8741afbc5..0dedcf492 100644 --- a/bazel/aquery.go +++ b/bazel/aquery.go @@ -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) diff --git a/bazel/aquery_test.go b/bazel/aquery_test.go index 43e41554e..88066c8fe 100644 --- a/bazel/aquery_test.go +++ b/bazel/aquery_test.go @@ -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"},