commit 312653b4173c177b896aab7d83fce1571b952019
author Alexander Smundak <asmundak@google.com> Tue May 05 16:06:48 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 05 16:06:48 2020 +0000
tree a8798e15344047b07f0c87850635640282c05d12
parent 7425fd91f059f1f50d6827391bf7c31fd43943b2
parent bd1f870df37b66c5a6bb0b63fb45c59fbe52d114

Merge "Canonicalize saved paths, Kythe cannot handle symlinks" am: bd1f870df3

Change-Id: Ic274bf1c2369c96f3a3fb98c5c40d49d8a76adb4

cc/builder.go

diff --git a/cc/builder.go b/cc/builder.go
index 2bedd9c..4e8f1fa 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -255,7 +255,11 @@
 	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"},
 		},