From 29fed1efe85cc07bb4311513e4acc1da73dfb298 Mon Sep 17 00:00:00 2001 From: Liana Kazanova Date: Tue, 30 Jul 2024 17:58:19 +0000 Subject: [PATCH] Revert "Conditionally pass kernel version to build.prop" This reverts commit 036d9e6744f312afde1f4eb68f38747df27cf5f8. Reason for revert: DroidMonitor: Potential culprit for b/356297315 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Change-Id: I58f1e43978eb812004d2e46fa7ce402e164d2800 --- android/build_prop.go | 7 +------ android/config.go | 4 ---- android/variable.go | 2 -- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/android/build_prop.go b/android/build_prop.go index 14e5e2310..80bbfc19d 100644 --- a/android/build_prop.go +++ b/android/build_prop.go @@ -121,12 +121,7 @@ func (p *buildPropModule) GenerateAndroidBuildActions(ctx ModuleContext) { postProcessCmd.Flag("--allow-dup") } postProcessCmd.FlagWithArg("--sdk-version ", config.PlatformSdkVersion().String()) - 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.FlagWithInput("--kernel-version-file-for-uffd-gc ", PathForOutput(ctx, "dexpreopt/kernel_version_for_uffd_gc.txt")) postProcessCmd.Text(p.outputFilePath.String()) postProcessCmd.Flags(p.properties.Block_list) diff --git a/android/config.go b/android/config.go index 5f2307cdb..92aae7e16 100644 --- a/android/config.go +++ b/android/config.go @@ -2081,7 +2081,3 @@ 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) -} diff --git a/android/variable.go b/android/variable.go index 2abe80b10..5356e8525 100644 --- a/android/variable.go +++ b/android/variable.go @@ -508,8 +508,6 @@ type ProductVariables struct { ArtTargetIncludeDebugBuild *bool `json:",omitempty"` SystemPropFiles []string `json:",omitempty"` - - EnableUffdGc *string `json:",omitempty"` } type PartitionQualifiedVariablesType struct {