Turn apex compression from opt-out into opt-in am: 82aab58aea

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77afe618e9517d6b2a6a7dd8bf786af211c1bd0f
This commit is contained in:
Nikita Ioffe
2021-01-29 20:47:16 +00:00
committed by Automerger Merge Worker

View File

@@ -780,7 +780,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
ctx.PropertyErrorf("test_only_force_compression", "not available") ctx.PropertyErrorf("test_only_force_compression", "not available")
return return
} }
compressionEnabled := ctx.Config().CompressedApex() && proptools.BoolDefault(a.properties.Compressible, true) compressionEnabled := ctx.Config().CompressedApex() && proptools.BoolDefault(a.properties.Compressible, false)
if apexType == imageApex && (compressionEnabled || a.testOnlyShouldForceCompression()) { if apexType == imageApex && (compressionEnabled || a.testOnlyShouldForceCompression()) {
a.isCompressed = true a.isCompressed = true
unsignedCompressedOutputFile := android.PathForModuleOut(ctx, a.Name()+".capex.unsigned") unsignedCompressedOutputFile := android.PathForModuleOut(ctx, a.Name()+".capex.unsigned")