diff options
| -rw-r--r-- | android/config.go | 4 | ||||
| -rw-r--r-- | android/variable.go | 7 | ||||
| -rw-r--r-- | apex/apex.go | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/android/config.go b/android/config.go index 27d3b87ba..94285f822 100644 --- a/android/config.go +++ b/android/config.go @@ -1834,6 +1834,10 @@ func (c *config) ApexCompressionEnabled() bool { return Bool(c.productVariables.CompressedApex) && !c.UnbundledBuildApps() } +func (c *config) DefaultApexPayloadType() string { + return StringDefault(c.productVariables.DefaultApexPayloadType, "ext4") +} + func (c *config) UseSoongSystemImage() bool { return Bool(c.productVariables.UseSoongSystemImage) } diff --git a/android/variable.go b/android/variable.go index 39b6c6a18..f60d447a3 100644 --- a/android/variable.go +++ b/android/variable.go @@ -409,9 +409,10 @@ type ProductVariables struct { Ndk_abis *bool `json:",omitempty"` - ForceApexSymlinkOptimization *bool `json:",omitempty"` - CompressedApex *bool `json:",omitempty"` - Aml_abis *bool `json:",omitempty"` + ForceApexSymlinkOptimization *bool `json:",omitempty"` + CompressedApex *bool `json:",omitempty"` + DefaultApexPayloadType *string `json:",omitempty"` + Aml_abis *bool `json:",omitempty"` DexpreoptGlobalConfig *string `json:",omitempty"` diff --git a/apex/apex.go b/apex/apex.go index f14f184be..cac2b890a 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1740,7 +1740,8 @@ func (a *apexBundle) setSystemLibLink(ctx android.ModuleContext) { } func (a *apexBundle) setPayloadFsType(ctx android.ModuleContext) { - switch proptools.StringDefault(a.properties.Payload_fs_type, ext4FsType) { + defaultFsType := ctx.Config().DefaultApexPayloadType() + switch proptools.StringDefault(a.properties.Payload_fs_type, defaultFsType) { case ext4FsType: a.payloadFsType = ext4 case f2fsFsType: |