StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't delete withres-withoutdex jar from R8 rules" into main am: 72928074f5 am: 4003606c5f am: e77d2e4197

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

Change-Id: Iab4b4ef4c4a7f6d54cb46b9d9858d846891a715d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-10-03 20:55:02 +00:00
committed by Automerger Merge Worker
parent 50929ce3f4 e77d2e4197
commit 5836515d26
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/dex.go
View File

@@ -154,7 +154,7 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8",
`rm -rf ${outUsageDir} && ` +
`$zipTemplate${config.SoongZipCmd} $zipFlags -o $outDir/classes.dex.jar -C $outDir -f "$outDir/classes*.dex" && ` +
`${config.MergeZipsCmd} -D -stripFile "**/*.class" $mergeZipsFlags $out $outDir/classes.dex.jar $in && ` +
`rm -f "$tmpJar" "$outDir/classes*.dex" "$outDir/classes.dex.jar"`,
`rm -f "$outDir/classes*.dex" "$outDir/classes.dex.jar"`,
Depfile: "${out}.d",
Deps: blueprint.DepsGCC,
CommandDeps: []string{