diff options
| author | 2025-01-06 11:51:02 -0800 | |
|---|---|---|
| committer | 2025-01-06 11:51:02 -0800 | |
| commit | 928378de6a85f8a52790cf8b0e77ccaa44251e96 (patch) | |
| tree | 38fe9453a802fcd6be75d605b39cd337b1979163 /java | |
| parent | 8440f9d27022fbc6dc73c1fdb97e28628adf952d (diff) | |
| parent | 01cd016d6781493556dead6382f16b6fd62b8841 (diff) | |
Merge "Use test ([) instead of extended test ([[) in if statements" into main
Diffstat (limited to 'java')
| -rw-r--r-- | java/builder.go | 2 | ||||
| -rw-r--r-- | java/kotlin.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/builder.go b/java/builder.go index 88058e09a..8d4d6af8a 100644 --- a/java/builder.go +++ b/java/builder.go @@ -56,7 +56,7 @@ var ( `$zipTemplate${config.SoongZipCmd} -jar -o $out.tmp -C $outDir -D $outDir && ` + `if ! cmp -s "$out.tmp" "$out"; then mv "$out.tmp" "$out"; fi && ` + `if ! cmp -s "$annoSrcJar.tmp" "$annoSrcJar"; then mv "$annoSrcJar.tmp" "$annoSrcJar"; fi && ` + - `if [[ -f "$out.pc_state.new" ]]; then mv "$out.pc_state.new" "$out.pc_state"; fi && ` + + `if [ -f "$out.pc_state.new" ]; then mv "$out.pc_state.new" "$out.pc_state"; fi && ` + `rm -rf "$srcJarDir" "$outDir"`, CommandDeps: []string{ "${config.FindInputDeltaCmd}", diff --git a/java/kotlin.go b/java/kotlin.go index e1a3f71a3..308bb0305 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -198,7 +198,7 @@ var kaptStubs = pctx.AndroidRemoteStaticRule("kaptStubs", android.RemoteRuleSupp `$kaptProcessor ` + `-Xbuild-file=$kotlinBuildFile && ` + `${config.SoongZipCmd} -jar -write_if_changed -o $out -C $kaptDir/stubs -D $kaptDir/stubs && ` + - `if [[ -f "$out.pc_state.new" ]]; then mv "$out.pc_state.new" "$out.pc_state"; fi && ` + + `if [ -f "$out.pc_state.new" ]; then mv "$out.pc_state.new" "$out.pc_state"; fi && ` + `rm -rf "$srcJarDir"`, CommandDeps: []string{ "${config.FindInputDeltaCmd}", |