Commit 65e10fba authored Feb 17, 2020 by Kousik Kumar

[DO NOT MERGE] Do not add ccWrapper to ccNoDeps rule

The "ccNoDeps" rule was introduced to separate out ".s" compilations
from other ".S" and ".c*" compilations. The ".s" compilation does not
produce a dependency file and does not support running a preprocessor
through it.
However, it does have ".include" directives, that do NOT take a macro,
but still does the equivalent of a "#include". The compilation of ".s"
assembly files also do NOT produce a dependency file.

Because they don't produce a dependency file AND because RBE's input
processor does not yet support finding dependencies for these files, I'm
making this change to not prepend rewrapper for these commands.

Test: Tested by running a build with this change and ensuring the ".s"
compilations aren't being sent to rewrapper.

Bug: b/166182389
Change-Id: I60bb14ff92596e4992e9f675bdc199f1440d4327
Merged-In: I60bb14ff92596e4992e9f675bdc199f1440d4327

parent 4807a1b5

cc/builder.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -55,9 +55,9 @@ var (
		},
		"ccCmd", "cFlags")

		ccNoDeps = pctx.AndroidRemoteStaticRule("ccNoDeps", android.RemoteRuleSupports{Goma: true},
		ccNoDeps = pctx.AndroidStaticRule("ccNoDeps",
		blueprint.RuleParams{
		Command: "$relPwd ${config.CcWrapper}$ccCmd -c $cFlags -o $out $in",
		Command: "$relPwd $ccCmd -c $cFlags -o $out $in",
		CommandDeps: []string{"$ccCmd"},
		},
		"ccCmd", "cFlags")