Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ec3fce9 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 8f205635

java/builder.go

+2 −1
Original line number Diff line number Diff line
@@ -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 && ` +