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

Change-Id: Ie8ee4760938f3afdd6a41dffffd8d504fa6beb6e
2020-02-17 05:38:30 +00:00
parent 1b4c46f529 e8c1a8fddb
commit 1f68e6334c
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)
 	}