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

Change-Id: I838bbd0ca6da2a8c01b8af4cced575374db7fe9f
2020-02-17 05:23:05 +00:00 · 2020-02-17 05:23:05 +00:00 · e8c1a8fddb
parent 0c7a78cf82 954b29728d
commit e8c1a8fddb
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)
 	}