diff options
author | Oliver Nguyen <olivernguyen@google.com> | 2022-05-24 21:39:33 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-24 21:39:33 +0000 |
commit | f20ff434b2dfea70cccd09e89a8f67c7091947f7 (patch) | |
tree | 395acce1f24f0823bc6dbc022dca00bf8ab60ab6 | |
parent | 7e1680dae2a13b1ccb4b3c7f64525461e8971ee4 (diff) | |
parent | 6aa7973ee5a3f09f263136620b8270544191f1c8 (diff) | |
download | jacoco-f20ff434b2dfea70cccd09e89a8f67c7091947f7.tar.gz |
Reland: "Enable jacocoagent to build as host module." am: b97e069589 am: bad44a6a58 am: e6c60d7a67 am: a1776dd349 am: 6aa7973ee5
Original change: https://android-review.googlesource.com/c/platform/external/jacoco/+/2099442
Change-Id: I63cd8b9c237a6d2c7d97acaae2bae017a44fddd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
5 files changed, 6 insertions, 4 deletions
@@ -58,6 +58,7 @@ license { java_library { name: "jacocoagent", + host_supported: true, installable: true, apex_available: [ diff --git a/org.jacoco.core/src/org/jacoco/core/internal/instr/ClassFieldProbeArrayStrategy.java b/org.jacoco.core/src/org/jacoco/core/internal/instr/ClassFieldProbeArrayStrategy.java index 7a54b6d8..3e26d1b4 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/instr/ClassFieldProbeArrayStrategy.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/instr/ClassFieldProbeArrayStrategy.java @@ -29,7 +29,7 @@ class ClassFieldProbeArrayStrategy implements IProbeArrayStrategy { * Frame stack with a single boolean array. */ private static final Object[] FRAME_STACK_ARRZ = new Object[] { - InstrSupport.DATAFIELD_DESC }; + InstrSupport.DATAFIELD_DESC_UNQUALIFIED }; /** * Empty frame locals. diff --git a/org.jacoco.core/src/org/jacoco/core/internal/instr/InstrSupport.java b/org.jacoco.core/src/org/jacoco/core/internal/instr/InstrSupport.java index c125112d..a805e0ff 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/instr/InstrSupport.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/instr/InstrSupport.java @@ -79,7 +79,8 @@ public final class InstrSupport { * <code>boolean[]</code>). */ // BEGIN android-change - public static final String DATAFIELD_DESC = "Lorg/jacoco/core/data/IExecutionData;"; + public static final String DATAFIELD_DESC_UNQUALIFIED = "org/jacoco/core/data/IExecutionData"; + public static final String DATAFIELD_DESC = "L" + DATAFIELD_DESC_UNQUALIFIED + ";"; // END android-change // === Init Method === diff --git a/org.jacoco.core/src/org/jacoco/core/internal/instr/InterfaceFieldProbeArrayStrategy.java b/org.jacoco.core/src/org/jacoco/core/internal/instr/InterfaceFieldProbeArrayStrategy.java index decd234c..9c36ba7a 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/instr/InterfaceFieldProbeArrayStrategy.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/instr/InterfaceFieldProbeArrayStrategy.java @@ -29,7 +29,7 @@ class InterfaceFieldProbeArrayStrategy implements IProbeArrayStrategy { * Frame stack with a single boolean array. */ private static final Object[] FRAME_STACK_ARRZ = new Object[] { - InstrSupport.DATAFIELD_DESC }; + InstrSupport.DATAFIELD_DESC_UNQUALIFIED }; /** * Empty frame locals. diff --git a/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeInserter.java b/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeInserter.java index 20794f60..59dff4bf 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeInserter.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeInserter.java @@ -154,7 +154,7 @@ class ProbeInserter extends MethodVisitor implements IProbeInserter { int pos = 0; // Current variable position while (idx < nLocal || pos <= variable) { if (pos == variable) { - newLocal[newIdx++] = InstrSupport.DATAFIELD_DESC; + newLocal[newIdx++] = InstrSupport.DATAFIELD_DESC_UNQUALIFIED; pos++; } else { if (idx < nLocal) { |