Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29fed1ef authored by Liana Kazanova's avatar Liana Kazanova Committed by Gerrit Code Review
Browse files

Revert "Conditionally pass kernel version to build.prop" 

This reverts commit 036d9e67.

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
parent 036d9e67

android/build_prop.go

+1 −6
Original line number Diff line number Diff line
@@ -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.Text(p.outputFilePath.String())

	postProcessCmd.Flags(p.properties.Block_list)

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line
@@ -508,8 +508,6 @@ type ProductVariables struct { 
	ArtTargetIncludeDebugBuild *bool `json:",omitempty"`



	SystemPropFiles []string `json:",omitempty"`



	EnableUffdGc *string `json:",omitempty"`

}



type PartitionQualifiedVariablesType struct {