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

Commit 2426d490 authored by Liana Kazanova's avatar Liana Kazanova Committed by Gerrit Code Review
Browse files

Merge "Revert "Conditionally pass kernel version to build.prop"" into main

parents 8975548e 29fed1ef

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

}

android/variable.go

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



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



	EnableUffdGc *string `json:",omitempty"`

}



type PartitionQualifiedVariablesType struct {