commit 954b29728db00a55c9ec366ef8c7a2fdd0329583
author Jackal Guo <jackalguo@google.com> Mon Feb 17 05:12:06 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 17 05:12:06 2020 +0000
tree a85550c28f27a3dfc18806331bd9a1ced33c5adc
parent 2fe818f8b0150d023ba3360b8ae26d25a8c429bf
parent c021ea0b3543d4ff64b16414c0276b96dc5b2c4b

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

java/java.go

diff --git a/java/java.go b/java/java.go
index 41fd8da..ceedd89 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1510,11 +1510,6 @@
 		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)
 	}