commit c021ea0b3543d4ff64b16414c0276b96dc5b2c4b
author Jackal Guo <jackalguo@google.com> Mon Feb 17 03:25:56 2020 +0000
committer Jackal Guo <jackalguo@google.com> Mon Feb 17 03:25:56 2020 +0000
tree 0a708c3a866bd671ef6ae54dfd692a493ac8d71e
parent 33b6654eeace28ceeb8f8328c01722abc4cdc6c6

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

This reverts commit 33b6654eeace28ceeb8f8328c01722abc4cdc6c6.

Reason for revert: verify build breakage

Change-Id: I712a9de8ca3bfb17c36d3b8efa6176cdaf26640e

java/java.go

diff --git a/java/java.go b/java/java.go
index 182dbc3..dd44d06 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1459,11 +1459,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)
 	}