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 40a73d6e7..bb2c38a1d 100644 --- a/android/config.go +++ b/android/config.go @@ -2085,7 +2085,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 a715e0eb0..00dcbc409 100644 --- a/android/variable.go +++ b/android/variable.go @@ -509,8 +509,6 @@ type ProductVariables struct { ArtTargetIncludeDebugBuild *bool `json:",omitempty"` SystemPropFiles []string `json:",omitempty"` - - EnableUffdGc *string `json:",omitempty"` } type PartitionQualifiedVariablesType struct {