diff options
| author | 2020-12-09 08:05:06 +0000 | |
|---|---|---|
| committer | 2020-12-09 08:05:06 +0000 | |
| commit | 5b0b94ecea8eef14bc74a506a0ac0031d727964c (patch) | |
| tree | 65f04f7ad4391c61ce92501aab33140e7c006080 | |
| parent | 6bba8382af86b5ffa56ed95a5b9bb4045933dc7e (diff) | |
| parent | 26d195521ba831545c48e084b4ab7a647d7ecb36 (diff) | |
Merge "Soong: remove output file before running SoongZip"
| -rw-r--r-- | java/builder.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/builder.go b/java/builder.go index cd3524542..995160d0e 100644 --- a/java/builder.go +++ b/java/builder.go @@ -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} ` + |