| commit | c6c534f1a028d837c1c50a69dbac0104b73f57c2 | [log] [tgz] |
|---|---|---|
| author | Søren Gjesse <sgjesse@google.com> | Thu Jan 11 14:57:36 2024 +0100 |
| committer | Søren Gjesse <sgjesse@google.com> | Thu Jan 11 14:57:36 2024 +0100 |
| tree | d7a9f1dbe73bb8c6c2002c7bf4d05792b9c41fc1 | |
| parent | cff7bfbdbea9d46cec0ffb421f86407f17a8998e [diff] |
Improve the error for unsupported desugared library machine specification Instead of this message: Unsupported machine version number 201 not in [200,200] give the "generic" desugared library error message with DAC references: Unsupported desugared library configuration version, please upgrade the D8/R8 compiler. See https://developer.android.com/studio/build/library-desugaring-versions. To learn more about library desugaring read https://developer.android.com/studio/build/library-desugaring. Bug: b/319604744 Change-Id: I8bfb0f422b601039e10e55c67a8c094671765643
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecificationParser.java b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecificationParser.java index 0d03018..3a5e7ee 100644 --- a/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecificationParser.java +++ b/src/main/java/com/android/tools/r8/ir/desugar/desugaredlibrary/machinespecification/MachineDesugaredLibrarySpecificationParser.java
@@ -35,6 +35,7 @@ import static com.android.tools.r8.ir.desugar.desugaredlibrary.machinespecification.MachineSpecificationJsonPool.WRAPPER_KEY; import com.android.tools.r8.StringResource; +import com.android.tools.r8.errors.UnsupportedDesugaredLibraryConfigurationVersionDiagnostic; import com.android.tools.r8.graph.DexField; import com.android.tools.r8.graph.DexItemFactory; import com.android.tools.r8.graph.DexMethod; @@ -129,15 +130,7 @@ int machineVersion = required(jsonConfig, CONFIGURATION_FORMAT_VERSION_KEY).getAsInt(); if (machineVersion < MIN_SUPPORTED_VERSION || machineVersion > MAX_SUPPORTED_VERSION) { throw reporter.fatalError( - new StringDiagnostic( - "Unsupported machine version number " - + machineVersion - + " not in [" - + MIN_SUPPORTED_VERSION - + "," - + MAX_SUPPORTED_VERSION - + "]", - origin)); + new UnsupportedDesugaredLibraryConfigurationVersionDiagnostic(origin)); } MachineTopLevelFlags topLevelFlags = parseTopLevelFlags(jsonConfigString); parsePackageMap();