Merge "Revert "Turn on the instrumentation by default for the java code in APEXes"" am: 954b29728d
am: e8c1a8fddb
Change-Id: Ie8ee4760938f3afdd6a41dffffd8d504fa6beb6e
This commit is contained in:
@@ -1510,11 +1510,6 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
|
|||||||
j.headerJarFile = j.implementationJarFile
|
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) {
|
if j.shouldInstrument(ctx) {
|
||||||
outputFile = j.instrument(ctx, flags, outputFile, jarName)
|
outputFile = j.instrument(ctx, flags, outputFile, jarName)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user