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

This commit is contained in:
Jackal Guo 2020-02-17 05:12:06 +00:00 committed by Gerrit Code Review
commit 954b29728d

View file

@ -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)
}