From c021ea0b3543d4ff64b16414c0276b96dc5b2c4b Mon Sep 17 00:00:00 2001 From: Jackal Guo Date: Mon, 17 Feb 2020 03:25:56 +0000 Subject: [PATCH] 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 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/java/java.go b/java/java.go index 182dbc360..dd44d06aa 100644 --- a/java/java.go +++ b/java/java.go @@ -1459,11 +1459,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) }