Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 954b2972 authored by Jackal Guo's avatar Jackal Guo Committed by Gerrit Code Review
Browse files

Merge "Revert "Turn on the instrumentation by default for the java code in APEXes""

parents 2fe818f8 c021ea0b
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -1510,11 +1510,6 @@ 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
	if android.DirectlyInAnyApex(ctx, ctx.ModuleName()) && !j.IsForPlatform() {
		j.properties.Instrument = true
	}

	if j.shouldInstrument(ctx) {
		outputFile = j.instrument(ctx, flags, outputFile, jarName)
	}