Merge "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15747538
Change-Id: Ifa33cdad01dac8e81724d97f6373b745ff775ca9
diff --git a/cc/builder.go b/cc/builder.go
index 98c58dd..b5c3560 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -517,7 +517,7 @@
sAbiDumpFiles = append(sAbiDumpFiles, sAbiDumpFile)
dumpRule := sAbiDump
- if ctx.Config().IsEnvTrue("RBE_ABI_DUMPER") {
+ if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_ABI_DUMPER") {
dumpRule = sAbiDumpRE
}
ctx.Build(pctx, android.BuildParams{
@@ -702,7 +702,7 @@
}
rule := ld
- if ctx.Config().IsEnvTrue("RBE_CXX_LINKS") {
+ if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_CXX_LINKS") {
rule = ldRE
}
@@ -848,7 +848,7 @@
"ldCmd": ldCmd,
"ldFlags": flags.ldFlags,
}
- if ctx.Config().IsEnvTrue("RBE_CXX_LINKS") {
+ if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_CXX_LINKS") {
rule = partialLdRE
args["inCommaList"] = strings.Join(objFiles.Strings(), ",")
}
diff --git a/java/builder.go b/java/builder.go
index 0e7574e..131f21a 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -297,7 +297,7 @@
annoDir = filepath.Join(shardDir, annoDir)
}
rule := javac
- if ctx.Config().IsEnvTrue("RBE_JAVAC") {
+ if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_JAVAC") {
rule = javacRE
}
ctx.Build(pctx, android.BuildParams{
diff --git a/java/dex.go b/java/dex.go
index 45fa068..2a3cf49 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -204,7 +204,7 @@
"outDict": j.proguardDictionary.String(),
"outDir": outDir.String(),
}
- if ctx.Config().IsEnvTrue("RBE_R8") {
+ if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_R8") {
rule = r8RE
args["implicits"] = strings.Join(r8Deps.Strings(), ",")
}
@@ -220,7 +220,7 @@
} else {
d8Flags, d8Deps := j.d8Flags(ctx, flags)
rule := d8
- if ctx.Config().IsEnvTrue("RBE_D8") {
+ if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_D8") {
rule = d8RE
}
ctx.Build(pctx, android.BuildParams{
