Revert "Disable RBE for header-abi-dumper"
This reverts commit 6580d84f51da3875209a23f163ae5d74d6804f80.
Reason for revert: The bugfix for reproxy was released to this branch.
Test: make
Bug: 226497964
Change-Id: I38e30d3dc71fa7857a61fcadf5895075608fd966
diff --git a/cc/builder.go b/cc/builder.go
index c289cbd..f3faca8 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -702,8 +702,10 @@
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(),