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

Commit 657ee23d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Pass "-Xgc:CMC" to dex2oat when userfaultfd GC is enabled."

parents 6960ac12 616be069

dexpreopt/config.go

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ type GlobalConfig struct { 
	// quickly silence build errors. This flag should be used with caution and only as a temporary

	// measure, as it masks real errors and affects performance.

	RelaxUsesLibraryCheck bool



	EnableUffdGc bool // preopt with the assumption that userfaultfd GC will be used on device.

}



var allPlatformSystemServerJarsKey = android.NewOnceKey("allPlatformSystemServerJars")

dexpreopt/dexpreopt.go

+4 −0
Original line number Diff line number Diff line
@@ -495,6 +495,10 @@ func dexpreoptCommand(ctx android.PathContext, globalSoong *GlobalSoongConfig, g 
		cmd.FlagWithInput("--profile-file=", profile)

	}



	if global.EnableUffdGc {

		cmd.Flag("--runtime-arg").Flag("-Xgc:CMC")

	}



	rule.Install(odexPath, odexInstallPath)

	rule.Install(vdexPath, vdexInstallPath)

}

java/dexpreopt_bootjars.go

+4 −0
Original line number Diff line number Diff line
@@ -752,6 +752,10 @@ func buildBootImageVariant(ctx android.ModuleContext, image *bootImageVariant, p 
		cmd.FlagWithArg("--instruction-set-features=", global.InstructionSetFeatures[arch])

	}



	if global.EnableUffdGc {

		cmd.Flag("--runtime-arg").Flag("-Xgc:CMC")

	}



	if global.BootFlags != "" {

		cmd.Flag(global.BootFlags)

	}