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

Commit 09557a0a authored by Inseob Kim's avatar Inseob Kim Committed by Gerrit Code Review
Browse files

Merge "Include TARGET_ODM_PROP to odm/etc/build.prop" into main

parents 78a3761b 9a22c7e6

android/build_prop.go

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ func (p *buildPropModule) propFiles(ctx ModuleContext) Paths { 
		return ctx.Config().SystemExtPropFiles(ctx)

	} else if partition == "product" {

		return ctx.Config().ProductPropFiles(ctx)

	} else if partition == "odm" {

		return ctx.Config().OdmPropFiles(ctx)

	}

	return nil

}

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -2057,6 +2057,10 @@ func (c *config) ProductPropFiles(ctx PathContext) Paths { 
	return PathsForSource(ctx, c.productVariables.ProductPropFiles)

}



func (c *config) OdmPropFiles(ctx PathContext) Paths {

	return PathsForSource(ctx, c.productVariables.OdmPropFiles)

}



func (c *config) EnableUffdGc() string {

	return String(c.productVariables.EnableUffdGc)

}

android/variable.go

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ type ProductVariables struct { 
	SystemPropFiles    []string `json:",omitempty"`

	SystemExtPropFiles []string `json:",omitempty"`

	ProductPropFiles   []string `json:",omitempty"`

	OdmPropFiles       []string `json:",omitempty"`



	EnableUffdGc *string `json:",omitempty"`

}