Merge "Revert "Turn on the instrumentation by default for the java code in APEXes"" am: 954b29728d am: e8c1a8fddb am: 1f68e6334c

Change-Id: Ic3e8d377ba929002da6d8377394a99c4f89fdceb
2020-02-17 05:51:11 +00:00 · 2020-02-17 05:51:11 +00:00 · 05d4eb88c2
parent 307039fc45 1f68e6334c
commit 05d4eb88c2
1 changed files with 0 additions and 5 deletions
--- a/java/java.go
+++ b/java/java.go
@ -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)
 	}