summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Jiyong Park <jiyong@google.com> 2020-02-18 12:50:44 +0000
committer Jiyong Park <jiyong@google.com> 2020-02-24 15:59:21 +0900
commit00cae1cc88773a5238809130841b6a6b7eb63614 (patch)
tree6419521bdad6169580b36a721b607e036ae070dc /java/java.go
parentefbce1caced34559a9656916bfcdc944ba55048d (diff)
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
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go
index 462dba809..b33cb2aa3 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1519,6 +1519,11 @@ 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)
}