Revert "[Retrace] Make map version 2.2. stable to start emitting..."
Revert submission 74762
Reason for revert: test failures
Reverted changes: /q/submissionid:74762
Bug: b/169953605
Change-Id: I4a97c390031ece79b9f1554f1db67c04d0683761
diff --git a/src/main/java/com/android/tools/r8/naming/ComposingBuilder.java b/src/main/java/com/android/tools/r8/naming/ComposingBuilder.java
index 0fa8b25..fc4fd33 100644
--- a/src/main/java/com/android/tools/r8/naming/ComposingBuilder.java
+++ b/src/main/java/com/android/tools/r8/naming/ComposingBuilder.java
@@ -17,7 +17,6 @@
import com.android.tools.r8.naming.mappinginformation.MappingInformation;
import com.android.tools.r8.naming.mappinginformation.OutlineCallsiteMappingInformation;
import com.android.tools.r8.naming.mappinginformation.OutlineMappingInformation;
-import com.android.tools.r8.naming.mappinginformation.ResidualSignatureMappingInformation;
import com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation;
import com.android.tools.r8.naming.mappinginformation.RewriteFrameMappingInformation.ThrowsCondition;
import com.android.tools.r8.references.ArrayReference;
@@ -91,12 +90,11 @@
"Composition of mapping files supported from map version 2.2.");
}
MapVersion newMapVersion = newMapVersionInfo.getMapVersion();
- if (!ResidualSignatureMappingInformation.isSupported(newMapVersion)
+ // TODO(b/241763080): Should be stable map version.
+ if (newMapVersion.isLessThan(MapVersion.MAP_VERSION_EXPERIMENTAL)
|| newMapVersion.isUnknown()) {
throw new MappingComposeException(
- "Composition of mapping files supported from map version "
- + ResidualSignatureMappingInformation.SUPPORTED_VERSION
- + ".");
+ "Composition of mapping files supported from map version 2.2.");
}
if (currentMapVersion == null) {
currentMapVersion = newMapVersionInfo;
diff --git a/src/main/java/com/android/tools/r8/naming/MapVersion.java b/src/main/java/com/android/tools/r8/naming/MapVersion.java
index b17a34a..322d15d 100644
--- a/src/main/java/com/android/tools/r8/naming/MapVersion.java
+++ b/src/main/java/com/android/tools/r8/naming/MapVersion.java
@@ -13,11 +13,10 @@
MAP_VERSION_1_0("1.0"),
MAP_VERSION_2_0("2.0"),
MAP_VERSION_2_1("2.1"),
- MAP_VERSION_2_2("2.2"),
MAP_VERSION_EXPERIMENTAL("experimental"),
MAP_VERSION_UNKNOWN("unknown");
- public static final MapVersion STABLE = MAP_VERSION_2_2;
+ public static final MapVersion STABLE = MAP_VERSION_2_1;
private final String name;
diff --git a/src/main/java/com/android/tools/r8/naming/mappinginformation/ResidualSignatureMappingInformation.java b/src/main/java/com/android/tools/r8/naming/mappinginformation/ResidualSignatureMappingInformation.java
index 05bbad1..f0ae4a2 100644
--- a/src/main/java/com/android/tools/r8/naming/mappinginformation/ResidualSignatureMappingInformation.java
+++ b/src/main/java/com/android/tools/r8/naming/mappinginformation/ResidualSignatureMappingInformation.java
@@ -23,7 +23,7 @@
public abstract class ResidualSignatureMappingInformation extends ReferentialMappingInformation {
- public static final MapVersion SUPPORTED_VERSION = MapVersion.MAP_VERSION_2_2;
+ public static final MapVersion SUPPORTED_VERSION = MapVersion.MAP_VERSION_EXPERIMENTAL;
public static final String ID = "com.android.tools.r8.residualsignature";
public static final String SIGNATURE_KEY = "signature";
