From 2976bfd568bd117c99575cc322e6a535ed9bbb07 Mon Sep 17 00:00:00 2001 From: Kousik Kumar Date: Mon, 17 Feb 2020 00:26:55 -0800 Subject: [PATCH] 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. Change-Id: I60bb14ff92596e4992e9f675bdc199f1440d4327 --- cc/builder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cc/builder.go b/cc/builder.go index 3ecfe540c..136263b41 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -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")