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

Commit a646d475 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Soong: remove output file before running SoongZip" am: 5b0b94ec 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1511278

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4eeea88254801ba162251789db35894f967df94d
parents 0a30c0b6 5b0b94ec

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} ` +