StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Relax boot image check to allow platform Jacoco variant in a coverage build." am: 82aca76739 am: a0e1d71939

Browse Source 
Change-Id: I16e5694fe9b8fdf0443d775447b51297f7500796
This commit is contained in:
Ulyana Trafimovich
2020-04-08 17:25:08 +00:00
committed by Automerger Merge Worker
parent f8300fdce1 a0e1d71939
commit bac0c9dc97
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/dexpreopt_bootjars.go
View File

@@ -277,6 +277,9 @@ func getBootImageJar(ctx android.SingletonContext, image *bootImageConfig, modul
} else if isApexModule && apex.IsForPlatform() && Bool(module.(*Library).deviceProperties.Hostdex) {
// this is a special "hostdex" variant, skip it and resume search
return -1, nil
} else if name == "jacocoagent" && ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") {
// this is Jacoco platform variant for a coverage build, skip it and resume search
return -1, nil
} else {
// this (installable) jar is part of the platform, fail immediately
ctx.Errorf("module '%s' is part of the platform and not allowed in the ART boot image", name)