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

Commit 817133ee authored by Ulya Trafimovich's avatar Ulya Trafimovich
Browse files

Add forgotten apex prefix to Jacoco boot image module. 

This is a follow-up for https://r.android.com/1292915, which introduced
two-column format for the components of the boot jar list. This CL
fixes build failure for the coverage build.

Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true
Change-Id: Ib8b156bf81943fe07084cbce5e7e9bf70e759a5d
parent 266a66e2

java/dexpreopt_config.go

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ func genBootImageConfigs(ctx android.PathContext) map[string]*bootImageConfig { 
		artModules := global.ArtApexJars

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

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

			artModules = append(artModules, "jacocoagent")

			artModules = append(artModules, "com.android.art:jacocoagent")

		}

		frameworkModules := android.RemoveListFromList(global.BootJars, artModules)