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

Merge "Delete aapt2 generated java files after creating srcjars" into main am: 482ccfab04 am: b5c37f9bac am: 10ecc7ed1e

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

Change-Id: I92cb0c0c71014c78b57a5c5f52e7795219826d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-08-03 21:16:20 +00:00
committed by Automerger Merge Worker
parent 471c0c2cc6 10ecc7ed1e
commit 815ac4eaad
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/aapt2.go
View File

@@ -150,7 +150,8 @@ var aapt2LinkRule = pctx.AndroidStaticRule("aapt2Link",
`${config.Aapt2Cmd} link -o $out $flags --java $genDir --proguard $proguardOptions ` +
`--output-text-symbols ${rTxt} $inFlags && ` +
`${config.SoongZipCmd} -write_if_changed -jar -o $genJar -C $genDir -D $genDir &&` +
`${config.ExtractJarPackagesCmd} -i $genJar -o $extraPackages --prefix '--extra-packages '`,
`${config.ExtractJarPackagesCmd} -i $genJar -o $extraPackages --prefix '--extra-packages ' && ` +
`rm -rf $genDir`,
CommandDeps: []string{
"${config.Aapt2Cmd}",