Merge "Do not add ccWrapper to ccNoDeps rule"

2020-02-19 02:34:33 +00:00 · 2020-02-19 02:34:33 +00:00 · 8a2d1b4d86
parent e6c44dc8be 2976bfd568
commit 8a2d1b4d86
1 changed files with 2 additions and 2 deletions
--- 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")