Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 876264b4 authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge "Use PRODUCT variable for default payload fs type" into main

parents fe6e01ce 920809ad

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -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)

}

android/variable.go

+4 −3
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ type ProductVariables struct { 


	ForceApexSymlinkOptimization *bool   `json:",omitempty"`

	CompressedApex               *bool   `json:",omitempty"`

	DefaultApexPayloadType       *string `json:",omitempty"`

	Aml_abis                     *bool   `json:",omitempty"`



	DexpreoptGlobalConfig *string `json:",omitempty"`

apex/apex.go

+2 −1
Original line number Diff line number Diff line
@@ -1752,7 +1752,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: