Conditionally pass kernel version to build.prop
This is to replicate Makefile's behavior as-is. Bug: 322090587 Test: build and compare build command Change-Id: Ib9ebec920701ea561a007bf2a1ae092ae1b4ff28
This commit is contained in:
@@ -121,7 +121,12 @@ func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) {
|
||||
postProcessCmd.Flag("--allow-dup")
|
||||
}
|
||||
postProcessCmd.FlagWithArg("--sdk-version ", config.PlatformSdkVersion().String())
|
||||
postProcessCmd.FlagWithInput("--kernel-version-file-for-uffd-gc ", PathForOutput(ctx, "dexpreopt/kernel_version_for_uffd_gc.txt"))
|
||||
if ctx.Config().EnableUffdGc() == "default" {
|
||||
postProcessCmd.FlagWithInput("--kernel-version-file-for-uffd-gc ", PathForOutput(ctx, "dexpreopt/kernel_version_for_uffd_gc.txt"))
|
||||
} else {
|
||||
// still need to pass an empty string to kernel-version-file-for-uffd-gc
|
||||
postProcessCmd.FlagWithArg("--kernel-version-file-for-uffd-gc ", `""`)
|
||||
}
|
||||
postProcessCmd.Text(p.outputFilePath.String())
|
||||
postProcessCmd.Flags(p.properties.Block_list)
|
||||
|
||||
|
@@ -2081,3 +2081,7 @@ func (c *config) UseDebugArt() bool {
|
||||
func (c *config) SystemPropFiles(ctx PathContext) Paths {
|
||||
return PathsForSource(ctx, c.productVariables.SystemPropFiles)
|
||||
}
|
||||
|
||||
func (c *config) EnableUffdGc() string {
|
||||
return String(c.productVariables.EnableUffdGc)
|
||||
}
|
||||
|
@@ -508,6 +508,8 @@ type ProductVariables struct {
|
||||
ArtTargetIncludeDebugBuild *bool `json:",omitempty"`
|
||||
|
||||
SystemPropFiles []string `json:",omitempty"`
|
||||
|
||||
EnableUffdGc *string `json:",omitempty"`
|
||||
}
|
||||
|
||||
type PartitionQualifiedVariablesType struct {
|
||||
|
Reference in New Issue
Block a user