From 0713e4f173f5574bfc13b0c520d5d83d77a420a7 Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Wed, 17 Aug 2022 12:50:13 +0800 Subject: [PATCH] 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 --- cc/builder.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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(),