summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hsin-Yi Chen <hsinyichen@google.com> 2022-08-22 02:16:04 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-08-22 02:16:04 +0000
commit49542c85416b64d19a1d495f037d310a669e8da3 (patch)
tree478dcea187395212d982051f88a2e2086c48bd1d
parentff2768d28a24b00972e4300ad9da4de00cfe2559 (diff)
parent0713e4f173f5574bfc13b0c520d5d83d77a420a7 (diff)
Merge "Revert "Disable RBE for header-abi-dumper""
-rw-r--r--cc/builder.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/cc/builder.go b/cc/builder.go
index c289cbde2..f3faca801 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -702,8 +702,10 @@ func transformSourceToObj(ctx ModuleContext, subdir string, srcFiles, noTidySrcs
sAbiDumpFile := android.ObjPathWithExt(ctx, subdir, srcFile, "sdump")
sAbiDumpFiles = append(sAbiDumpFiles, sAbiDumpFile)
- // TODO(b/226497964): dumpRule = sAbiDumpRE if USE_RBE and RBE_ABI_DUMPER are true.
dumpRule := sAbiDump
+ if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_ABI_DUMPER") {
+ dumpRule = sAbiDumpRE
+ }
ctx.Build(pctx, android.BuildParams{
Rule: dumpRule,
Description: "header-abi-dumper " + srcFile.Rel(),