Revert "Conditionally pass kernel version to build.prop"

This reverts commit 036d9e6744.

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

@@ -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)
 

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)
-}

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 {