summaryrefslogtreecommitdiff
path: root/apex/builder.go
diff options
context:
space:
mode:
author Oriol Prieto Gasco <opg@google.com> 2021-10-14 15:33:41 -0400
committer Wei Li <weiwli@google.com> 2022-01-22 00:45:58 +0000
commita07099d858963d1c0fd3b3e53c84a69b1e5487cd (patch)
tree0ef7fa8f9cb22acb46949d80afd441907f7e9b37 /apex/builder.go
parentf49ca9e40d5970117989ded79d19bfbd11314ae4 (diff)
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)
Diffstat (limited to 'apex/builder.go')
-rw-r--r--apex/builder.go4
1 files changed, 2 insertions, 2 deletions
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 {
////////////////////////////////////////////////////////////////////////////////////