Merge "Use EMMA_INSTRUMENT_FRAMEWORK for apex framework libs." (a7a36e22) · Commits · e / os / android_build_soong

java/java.go

+16 −5

Original line number	Diff line number	Diff line
		@@ -610,6 +610,21 @@ func (j *Module) shouldInstrumentStatic(ctx android.BaseModuleContext) bool {
		ctx.Config().UnbundledBuild())
		}

		func (j *Module) shouldInstrumentInApex(ctx android.BaseModuleContext) bool {
		// Force enable the instrumentation for java code that is built for APEXes ...
		// except for the jacocoagent itself (because instrumenting jacocoagent using jacocoagent
		// doesn't make sense) or framework libraries (e.g. libraries found in the InstrumentFrameworkModules list) unless EMMA_INSTRUMENT_FRAMEWORK is true.
		isJacocoAgent := ctx.ModuleName() == "jacocoagent"
		if android.DirectlyInAnyApex(ctx, ctx.ModuleName()) && !isJacocoAgent && !j.IsForPlatform() {
		if !inList(ctx.ModuleName(), config.InstrumentFrameworkModules) {
		return true
		} else if ctx.Config().IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK") {
		return true
		}
		}
		return false
		}

		func (j *Module) sdkVersion() sdkSpec {
		return sdkSpecFrom(String(j.deviceProperties.Sdk_version))
		}
		@@ -1543,11 +1558,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
		j.headerJarFile = j.implementationJarFile
		}

		// Force enable the instrumentation for java code that is built for APEXes ...
		// except for the jacocoagent itself (because instrumenting jacocoagent using jacocoagent
		// doesn't make sense)
		isJacocoAgent := ctx.ModuleName() == "jacocoagent"
		if android.DirectlyInAnyApex(ctx, ctx.ModuleName()) && !isJacocoAgent && !j.IsForPlatform() {
		if j.shouldInstrumentInApex(ctx) {
		j.properties.Instrument = true
		}