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

Unverified Commit 769a8eee authored by Inseob Kim's avatar Inseob Kim Committed by Michael Bestas
Browse files

Revert^2 "Conditionally pass kernel version to build.prop" 

This reverts commit 29fed1ef.

Reason for revert: Fixed breakage with aosp/3200730, verified with ABTD

Change-Id: I207abd188636673250eb9a070be95db0b82f39e7
parent da1f628b

android/build_prop.go

+6 −1
Original line number Diff line number Diff line
@@ -106,7 +106,12 @@ 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

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

}

android/variable.go

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



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



	EnableUffdGc *string `json:",omitempty"`

}



type PartitionQualifiedVariablesType struct {