From 1ec3fce9b6c4e2867ec333ce72de8d51a7f1b59e Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 5 Mar 2020 12:43:14 -0800 Subject: [PATCH] Disable goma for javac actions in Soong goma can't handle the --system argument that Android must pass to javac. Bug: b/143658984 Test: treehugger Change-Id: I207668d8baa4ab28160938732a38f696aeac3f44 --- java/builder.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/builder.go b/java/builder.go index f9b53674d..3a0247d1e 100644 --- a/java/builder.go +++ b/java/builder.go @@ -38,7 +38,8 @@ 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.AndroidRemoteStaticRule("javac", android.RemoteRuleSupports{Goma: true, RBE: true, RBEFlag: android.RBE_JAVAC}, + // TODO(b/143658984): goma can't handle the --system argument to javac. + javac = pctx.AndroidRemoteStaticRule("javac", android.RemoteRuleSupports{Goma: false, RBE: true, RBEFlag: android.RBE_JAVAC}, blueprint.RuleParams{ Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +