From 5d668dfb6cafb877f16dd7834c8b42a8b2b49d17 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Fri, 6 May 2022 02:31:38 +0000
Subject: Revert "Enable jacocoagent to build as host module."

This reverts commit ff9b3671d912e1f8128166dea1ed11736e7c3440.

Reason for revert: broke test

Bug: 231643552
Bug: 231653919
Change-Id: I75f48a7b7a31246fd84d593ea6e3fdc46316589b
---
 Android.bp                                                             | 1 -
 .../org/jacoco/core/internal/instr/ClassFieldProbeArrayStrategy.java   | 2 +-
 org.jacoco.core/src/org/jacoco/core/internal/instr/InstrSupport.java   | 3 +--
 org.jacoco.core/src/org/jacoco/core/internal/instr/ProbeInserter.java  | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Android.bp b/Android.bp
index 25801a46..aad52a34 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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) {
-- 
cgit v1.2.3