Reland "Turn on the instrumentation by default for the java code in APEXes"
This reverts commit c021ea0b3543d4ff64b16414c0276b96dc5b2c4b.
Bug: 149353192
Change-Id: I2b1c0736202de26c5ea88c0ab14574bd7207a5fb
Test: N/A (this is a clean revert) forward fix will be followed
diff --git a/java/java.go b/java/java.go
index 462dba8..b33cb2a 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1519,6 +1519,11 @@
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)
}