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

Commit 5b0b94ec authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Soong: remove output file before running SoongZip"

parents 6bba8382 26d19552

java/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ var ( 
	// TODO(b/143658984): goma can't handle the --system argument to javac.

	javac, javacRE = remoteexec.MultiCommandStaticRules(pctx, "javac",

		blueprint.RuleParams{

			Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` +

			Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" "$out" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` +

				`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +

				`(if [ -s $srcJarDir/list ] || [ -s $out.rsp ] ; then ` +

				`${config.SoongJavacWrapper} $javaTemplate${config.JavacCmd} ` +