diff options
| author | 2023-08-03 22:44:16 +0000 | |
|---|---|---|
| committer | 2023-08-03 22:44:16 +0000 | |
| commit | b6d6ac7e4fb5ec6ead64b2b06b3390f7c85cd93a (patch) | |
| tree | 1b9f779ba0600a5088f9d889431bf0bb6a1f91fc /java/aapt2.go | |
| parent | 226d25eb6aeca40a3a1d675405af7db4745e5132 (diff) | |
| parent | ed4697d11b73166d5225a32f85fe4e80fc7afee0 (diff) | |
Merge "Delete aapt2 generated java files after creating srcjars" into main am: 482ccfab04 am: b5c37f9bac am: 10ecc7ed1e am: 815ac4eaad am: ed4697d11b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2690453
Change-Id: I27a1a17b44c585cbf998f04877305fe6bf43d203
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 abe154ea0..9bebeb8e7 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}", |