diff options
| author | Oliver Nguyen <olivernguyen@google.com> | 2022-06-30 20:39:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-06-30 20:39:56 +0000 |
| commit | 480587e2a9051d1f5d788b9bca2db56763e3d78d (patch) | |
| tree | 3b93bf24ab3912f2960b34b44377cf8ed1fd6c41 | |
| parent | f20ff434b2dfea70cccd09e89a8f67c7091947f7 (diff) | |
| parent | 63b215a0c60824aef6a0f2f33f94891a3468c1fa (diff) | |
| download | jacoco-480587e2a9051d1f5d788b9bca2db56763e3d78d.tar.gz | |
Enable jacocoagent as a Java agent for host. am: c4a2546eb0 am: 73588275c7 am: 0a19aa6057 am: 68db373e77 am: 63b215a0c6
Original change: https://android-review.googlesource.com/c/platform/external/jacoco/+/2139032
Change-Id: Icedadbdfd0586d526a5ce0cb0b7f4b904e8954f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 17 | ||||
| -rw-r--r-- | org.jacoco.agent/src/MANIFEST.MF | 3 | ||||
| -rw-r--r-- | org.jacoco.core/src/org/jacoco/core/runtime/LoggerRuntime.java | 2 | ||||
| -rw-r--r-- | org.jacoco.core/src/org/jacoco/core/runtime/RuntimeData.java | 2 |
4 files changed, 16 insertions, 8 deletions
@@ -60,6 +60,7 @@ java_library { name: "jacocoagent", host_supported: true, installable: true, + manifest: "org.jacoco.agent/src/MANIFEST.MF", apex_available: [ "//apex_available:anyapex", @@ -80,12 +81,16 @@ java_library { // system apps. // Note: we still may need to update the source code to cut dependencies in // mandatory jacoco classes. - exclude_srcs: [ - "org.jacoco.core/src/org/jacoco/core/runtime/ModifiedSystemClassRuntime.java", - "org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/PreMain.java", - "org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/CoverageTransformer.java", - "org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/JmxRegistration.java", - ], + target: { + android: { + exclude_srcs: [ + "org.jacoco.core/src/org/jacoco/core/runtime/ModifiedSystemClassRuntime.java", + "org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/PreMain.java", + "org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/CoverageTransformer.java", + "org.jacoco.agent.rt/src/org/jacoco/agent/rt/internal/JmxRegistration.java", + ], + }, + }, // In order to include Jacoco in core libraries, we cannot depend on // anything in the bootclasspath (or we would create dependency cycle). diff --git a/org.jacoco.agent/src/MANIFEST.MF b/org.jacoco.agent/src/MANIFEST.MF new file mode 100644 index 00000000..fb315f3d --- /dev/null +++ b/org.jacoco.agent/src/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Premain-Class: org.jacoco.agent.rt.internal.PreMain + diff --git a/org.jacoco.core/src/org/jacoco/core/runtime/LoggerRuntime.java b/org.jacoco.core/src/org/jacoco/core/runtime/LoggerRuntime.java index 1fc2b70f..f877b832 100644 --- a/org.jacoco.core/src/org/jacoco/core/runtime/LoggerRuntime.java +++ b/org.jacoco.core/src/org/jacoco/core/runtime/LoggerRuntime.java @@ -145,7 +145,7 @@ public class LoggerRuntime extends AbstractRuntime { mv.visitInsn(Opcodes.ICONST_0); mv.visitInsn(Opcodes.AALOAD); - mv.visitTypeInsn(Opcodes.CHECKCAST, InstrSupport.DATAFIELD_DESC); + mv.visitTypeInsn(Opcodes.CHECKCAST, InstrSupport.DATAFIELD_DESC_UNQUALIFIED); // Stack[0]: [Z diff --git a/org.jacoco.core/src/org/jacoco/core/runtime/RuntimeData.java b/org.jacoco.core/src/org/jacoco/core/runtime/RuntimeData.java index 00fb4b07..5be410fe 100644 --- a/org.jacoco.core/src/org/jacoco/core/runtime/RuntimeData.java +++ b/org.jacoco.core/src/org/jacoco/core/runtime/RuntimeData.java @@ -271,7 +271,7 @@ public class RuntimeData { // stack[0]: [Z - mv.visitTypeInsn(Opcodes.CHECKCAST, InstrSupport.DATAFIELD_DESC); + mv.visitTypeInsn(Opcodes.CHECKCAST, InstrSupport.DATAFIELD_DESC_UNQUALIFIED); } } |