diff options
| author | Oliver Nguyen <olivernguyen@google.com> | 2022-05-06 00:07:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-06 00:07:02 +0000 |
| commit | e15cc76e4ce8a7d1a3c77f5a1d41385b8229dc4b (patch) | |
| tree | 3c4490dc50221413aca35eba9621411d389dbf44 | |
| parent | 0a790e5aa576e29f8804540dd4069d241a8bb36d (diff) | |
| parent | b86f1303f549c4dc5410452c0040e64e4a32cafb (diff) | |
| download | jacoco-e15cc76e4ce8a7d1a3c77f5a1d41385b8229dc4b.tar.gz | |
Enable jacocoagent to build as host module. am: ff9b3671d9 am: 3c114c1d6d am: a26683de6a am: 05d1d281ab am: b86f1303f5
Original change: https://android-review.googlesource.com/c/platform/external/jacoco/+/2078145
Change-Id: I3f26b36c0f913492ff614d4caeb95192d9fb244e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
4 files changed, 5 insertions, 3 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/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) { |