From 4807a1b5ec60689e553b225c0cf16ace5873d67d Mon Sep 17 00:00:00 2001 From: Ramy Medhat Date: Mon, 27 Jan 2020 14:19:44 -0500 Subject: [DO NOT MERGE] Add support for experimentally enabling RBE support on specific rules. This CL adds RBE support to javac, r8, and d8 rules which is only enabled if respective environment variables are set. Test: an aosp_crosshatch build with and without the new variables. Bug: b/166182389 Change-Id: Ic82f3627944f6a5ee7b9f3228170c2709b1bfcb8 Merged-In: Ic82f3627944f6a5ee7b9f3228170c2709b1bfcb8 --- java/kotlin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/kotlin.go') diff --git a/java/kotlin.go b/java/kotlin.go index 72560301e..58dc64cd1 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -25,7 +25,7 @@ import ( "github.com/google/blueprint" ) -var kotlinc = pctx.AndroidRemoteStaticRule("kotlinc", android.SUPPORTS_GOMA, +var kotlinc = pctx.AndroidRemoteStaticRule("kotlinc", android.RemoteRuleSupports{Goma: true}, blueprint.RuleParams{ Command: `rm -rf "$classesDir" "$srcJarDir" "$kotlinBuildFile" && mkdir -p "$classesDir" "$srcJarDir" && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + @@ -74,7 +74,7 @@ func kotlinCompile(ctx android.ModuleContext, outputFile android.WritablePath, }) } -var kapt = pctx.AndroidRemoteStaticRule("kapt", android.SUPPORTS_GOMA, +var kapt = pctx.AndroidRemoteStaticRule("kapt", android.RemoteRuleSupports{Goma: true}, blueprint.RuleParams{ Command: `rm -rf "$srcJarDir" "$kotlinBuildFile" "$kaptDir" && mkdir -p "$srcJarDir" "$kaptDir" && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + -- cgit v1.2.3-59-g8ed1b