Relax boot image check to allow platform Jacoco variant in a coverage build.
Test: m nothing
Test: m EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true nothing
Bug: 153533941
Change-Id: I5847ec282f6b481cee61ed9ec6b6928c9a41fae7
Merged-In: I5847ec282f6b481cee61ed9ec6b6928c9a41fae7
(cherry picked from commit e0ce4ba491
)
This commit is contained in:
@@ -273,6 +273,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)
|
||||
|
Reference in New Issue
Block a user