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."

Browse Source
This commit is contained in:
Ulyana Trafimovich
2020-04-08 16:56:10 +00:00
committed by Gerrit Code Review
parent 846e60dbc7 e0ce4ba491
commit 82aca76739
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) { } else if isApexModule && apex.IsForPlatform() && Bool(module.(*Library).deviceProperties.Hostdex) {
// this is a special "hostdex" variant, skip it and resume search // this is a special "hostdex" variant, skip it and resume search
return -1, nil 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 { } else {
// this (installable) jar is part of the platform, fail immediately // 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) ctx.Errorf("module '%s' is part of the platform and not allowed in the ART boot image", name)