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

Merge "Instrument impl library belonging to apexes" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-22 19:01:41 +00:00
committed by Gerrit Code Review
parent 5e79b167b8 690df2e31b
commit b07e7fd542
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/base.go
View File

@@ -715,7 +715,12 @@ func (j *Module) shouldInstrumentInApex(ctx android.BaseModuleContext) bool {
// doesn't make sense) or framework libraries (e.g. libraries found in the InstrumentFrameworkModules list) unless EMMA_INSTRUMENT_FRAMEWORK is true. // doesn't make sense) or framework libraries (e.g. libraries found in the InstrumentFrameworkModules list) unless EMMA_INSTRUMENT_FRAMEWORK is true.
apexInfo, _ := android.ModuleProvider(ctx, android.ApexInfoProvider) apexInfo, _ := android.ModuleProvider(ctx, android.ApexInfoProvider)
isJacocoAgent := ctx.ModuleName() == "jacocoagent" isJacocoAgent := ctx.ModuleName() == "jacocoagent"
if j.DirectlyInAnyApex() && !isJacocoAgent && !apexInfo.IsForPlatform() {
isApexVariantSdkLibImplLib := j.SdkLibraryName() != nil &&
strings.HasSuffix(j.Name(), ".impl") &&
len(apexInfo.InApexVariants) > 0
if (j.DirectlyInAnyApex() || isApexVariantSdkLibImplLib) && !isJacocoAgent && !apexInfo.IsForPlatform() {
if !inList(ctx.ModuleName(), config.InstrumentFrameworkModules) { if !inList(ctx.ModuleName(), config.InstrumentFrameworkModules) {
return true return true
} else if ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") { } else if ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") {