StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Inseob Kim
2024-08-28 00:15:14 +00:00
committed by Gerrit Code Review
parent 78a3761bde 9a22c7e61b
commit 09557a0aa3
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/build_prop.go
View File

@@ -63,6 +63,8 @@ func (p *buildPropModule) propFiles(ctx ModuleContext) Paths {
return ctx.Config().SystemExtPropFiles(ctx) return ctx.Config().SystemExtPropFiles(ctx)
} else if partition == "product" { } else if partition == "product" {
return ctx.Config().ProductPropFiles(ctx) return ctx.Config().ProductPropFiles(ctx)
} else if partition == "odm" {
return ctx.Config().OdmPropFiles(ctx)
} }
return nil return nil
} }

4
android/config.go
View File

@@ -2057,6 +2057,10 @@ func (c *config) ProductPropFiles(ctx PathContext) Paths {
return PathsForSource(ctx, c.productVariables.ProductPropFiles) return PathsForSource(ctx, c.productVariables.ProductPropFiles)
} }
func (c *config) OdmPropFiles(ctx PathContext) Paths {
return PathsForSource(ctx, c.productVariables.OdmPropFiles)
}
func (c *config) EnableUffdGc() string { func (c *config) EnableUffdGc() string {
return String(c.productVariables.EnableUffdGc) return String(c.productVariables.EnableUffdGc)
} }

1
android/variable.go
View File

@@ -512,6 +512,7 @@ type ProductVariables struct {
SystemPropFiles []string `json:",omitempty"` SystemPropFiles []string `json:",omitempty"`
SystemExtPropFiles []string `json:",omitempty"` SystemExtPropFiles []string `json:",omitempty"`
ProductPropFiles []string `json:",omitempty"` ProductPropFiles []string `json:",omitempty"`
OdmPropFiles []string `json:",omitempty"`
EnableUffdGc *string `json:",omitempty"` EnableUffdGc *string `json:",omitempty"`
} }