diff options
| author | David Li <dvdli@google.com> | 2022-05-06 08:26:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-06 08:26:48 +0000 |
| commit | 7e1680dae2a13b1ccb4b3c7f64525461e8971ee4 (patch) | |
| tree | e68ce50b1fc964c12a1eb020ca8b2483ff2955d4 | |
| parent | e15cc76e4ce8a7d1a3c77f5a1d41385b8229dc4b (diff) | |
| parent | 672fcb2fe5b499313f25f6a5d12e08bb9de6eda9 (diff) | |
| download | jacoco-7e1680dae2a13b1ccb4b3c7f64525461e8971ee4.tar.gz | |
Revert "Enable jacocoagent to build as host module." am: 5d668dfb6c am: 8e2181e4bd am: f12a4bda9f am: 700a8e0e45 am: 672fcb2fe5
Original change: https://android-review.googlesource.com/c/platform/external/jacoco/+/2089503
Change-Id: Iaf774e6ca95813e537ef381449a58d4c2a926f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
4 files changed, 3 insertions, 5 deletions
@@ -58,7 +58,6 @@ 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 3e26d1b4..7a54b6d8 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_UNQUALIFIED }; + InstrSupport.DATAFIELD_DESC }; /** * 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 a805e0ff..c125112d 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,8 +79,7 @@ public final class InstrSupport { * <code>boolean[]</code>). */ // BEGIN android-change - public static final String DATAFIELD_DESC_UNQUALIFIED = "org/jacoco/core/data/IExecutionData"; - public static final String DATAFIELD_DESC = "L" + DATAFIELD_DESC_UNQUALIFIED + ";"; + public static final String DATAFIELD_DESC = "Lorg/jacoco/core/data/IExecutionData;"; // 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 59dff4bf..20794f60 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_UNQUALIFIED; + newLocal[newIdx++] = InstrSupport.DATAFIELD_DESC; pos++; } else { if (idx < nLocal) { |