diff options
| author | 2024-11-27 02:21:37 +0000 | |
|---|---|---|
| committer | 2024-11-27 02:21:37 +0000 | |
| commit | af3fd51117190ddbc5356e70a0156c778b5f62a2 (patch) | |
| tree | 663bd4d704a3024db507f981b308ef313690731a /apex/apex.go | |
| parent | aedc895394f1b1ae76d28e158a12d3dbe7e6108c (diff) | |
| parent | 5c5dc9dce3df18029df755cc303eb82267645a34 (diff) | |
Merge "apex: Do not compress EROFS APEX" into main am: 5c5dc9dce3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3368524
Change-Id: I138778adce346553b3e6b54568c4466a63ed2f64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index 381ff0f5e..5f9f31e99 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1743,7 +1743,13 @@ func (a *apexBundle) setPayloadFsType(ctx android.ModuleContext) { } func (a *apexBundle) isCompressable() bool { - return proptools.BoolDefault(a.overridableProperties.Compressible, false) && !a.testApex + if a.testApex { + return false + } + if a.payloadFsType == erofs { + return false + } + return proptools.Bool(a.overridableProperties.Compressible) } func (a *apexBundle) commonBuildActions(ctx android.ModuleContext) bool { |