diff options
| author | 2023-08-03 21:58:33 +0000 | |
|---|---|---|
| committer | 2023-08-03 21:58:33 +0000 | |
| commit | ed4697d11b73166d5225a32f85fe4e80fc7afee0 (patch) | |
| tree | e4c5e37472135568204c897af63fca408cfe4867 /java/aapt2.go | |
| parent | 76f5fac4b574894c32b75c725b39739eb326b5ee (diff) | |
| parent | 815ac4eaad14c92932f57e011f8d377cd9ade364 (diff) | |
Merge "Delete aapt2 generated java files after creating srcjars" into main am: 482ccfab04 am: b5c37f9bac am: 10ecc7ed1e am: 815ac4eaad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690453
Change-Id: I4eb292c66ed6e29127dc67938c77408da6d03a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/aapt2.go')
| -rw-r--r-- | java/aapt2.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/aapt2.go b/java/aapt2.go index 7845a0b23..4cff8a720 100644 --- a/java/aapt2.go +++ b/java/aapt2.go @@ -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}", |