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

Commit a4ef83b2 authored by Sasha Smundak's avatar Sasha Smundak
Browse files

Canonicalize saved paths, Kythe cannot handle symlinks 

Bug: 141385766
Test: build kzip
Change-Id: I87c4af719135ee89298d160bb8d6395ad7d6046c
parent b39e15d3

cc/builder.go

+5 −1
Original line number Diff line number Diff line
@@ -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"},

		},