Canonicalize saved paths, Kythe cannot handle symlinks

Bug: 141385766 Test: build kzip Change-Id: I87c4af719135ee89298d160bb8d6395ad7d6046c
2020-04-21 17:08:35 -07:00 · 2020-04-21 17:08:35 -07:00 · a4ef83b252
parent b39e15d3f3
commit a4ef83b252
1 changed files with 5 additions and 1 deletions
--- a/cc/builder.go
+++ b/cc/builder.go
@ -255,7 +255,11 @@ var (
 	kytheExtract = pctx.StaticRule("kythe",
 		blueprint.RuleParams{
 			Command: `rm -f $out && ` +
-				`KYTHE_CORPUS=${kytheCorpus} KYTHE_OUTPUT_FILE=$out KYTHE_VNAMES=$kytheVnames KYTHE_KZIP_ENCODING=${kytheCuEncoding} ` +
+				`KYTHE_CORPUS=${kytheCorpus} ` +
+				`KYTHE_OUTPUT_FILE=$out ` +
+				`KYTHE_VNAMES=$kytheVnames ` +
+				`KYTHE_KZIP_ENCODING=${kytheCuEncoding} ` +
+				`KYTHE_CANONICALIZE_VNAME_PATHS=prefer-relative ` +
 				`$cxxExtractor $cFlags $in `,
 			CommandDeps: []string{"$cxxExtractor", "$kytheVnames"},
 		},