From a07099d858963d1c0fd3b3e53c84a69b1e5487cd Mon Sep 17 00:00:00 2001 From: Oriol Prieto Gasco Date: Thu, 14 Oct 2021 15:33:41 -0400 Subject: Make 'Compressible' an overridable property This is needed to allow the Android Go versions of modules (com.google.android.go.*) to select a different compression toggle than their non-Go (com.google.android.*) conterparts. go/go-updatability Bug: 203024418 Test: Preloaded go variants on wembley, booted Android. Change-Id: Ic96aff5fafb65fbd08e8a69d47c994532e27819e Merged-In: Ic96aff5fafb65fbd08e8a69d47c994532e27819e (cherry picked from commit 2c4a96375aef7570076770474b5b73341455570d) --- apex/builder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apex/builder.go') diff --git a/apex/builder.go b/apex/builder.go index ea25537ca..a66e1e0fc 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -567,8 +567,8 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { outHostBinDir := ctx.Config().HostToolPath(ctx, "").String() prebuiltSdkToolsBinDir := filepath.Join("prebuilts", "sdk", "tools", runtime.GOOS, "bin") - // Figure out if need to compress apex. - compressionEnabled := ctx.Config().CompressedApex() && proptools.BoolDefault(a.properties.Compressible, false) && !a.testApex && !ctx.Config().UnbundledBuildApps() + // Figure out if we need to compress the apex. + compressionEnabled := ctx.Config().CompressedApex() && proptools.BoolDefault(a.overridableProperties.Compressible, false) && !a.testApex && !ctx.Config().UnbundledBuildApps() if apexType == imageApex { //////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3-59-g8ed1b