diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/builder.go | 2 | ||||
| -rw-r--r-- | java/kotlin.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/builder.go b/java/builder.go index 2fe4d8ab3..a8e54cc6f 100644 --- a/java/builder.go +++ b/java/builder.go @@ -38,7 +38,7 @@ var ( // this, all java rules write into separate directories and then are combined into a .jar file // (if the rule produces .class files) or a .srcjar file (if the rule produces .java files). // .srcjar files are unzipped into a temporary directory when compiled with javac. - javac = pctx.AndroidGomaStaticRule("javac", + javac = pctx.AndroidRemoteStaticRule("javac", android.SUPPORTS_GOMA, blueprint.RuleParams{ Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + diff --git a/java/kotlin.go b/java/kotlin.go index 81b89f96f..72560301e 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -25,7 +25,7 @@ import ( "github.com/google/blueprint" ) -var kotlinc = pctx.AndroidGomaStaticRule("kotlinc", +var kotlinc = pctx.AndroidRemoteStaticRule("kotlinc", android.SUPPORTS_GOMA, 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.AndroidGomaStaticRule("kapt", +var kapt = pctx.AndroidRemoteStaticRule("kapt", android.SUPPORTS_GOMA, blueprint.RuleParams{ Command: `rm -rf "$srcJarDir" "$kotlinBuildFile" "$kaptDir" && mkdir -p "$srcJarDir" "$kaptDir" && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + |