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

Commit 71c139dc authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge "Move the logic to add jacocoagent in instrumentation builds to make."

parents abf3f3c0 0a9dae6e

java/dexpreopt_config.go

+0 −4
Original line number Diff line number Diff line
@@ -82,10 +82,6 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { 
		deviceDir := android.PathForOutput(ctx, ctx.Config().DeviceName())



		artModules := global.ArtApexJars

		// With EMMA_INSTRUMENT_FRAMEWORK=true the Core libraries depend on jacoco.

		if ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") {

			artModules = artModules.Append("com.android.art", "jacocoagent")

		}

		frameworkModules := global.BootJars.RemoveList(artModules)



		artSubdir := "apex/art_boot_images/javalib"