commit a09cdc956b245c49d4d1b0a3bc65b25dcde0a1d2
author Ian Zerny <zerny@google.com> Mon Aug 29 14:31:26 2022 +0200
committer Ian Zerny <zerny@google.com> Mon Aug 29 14:31:26 2022 +0200
tree 79175c7e0555b63d83f303cce41146754ac453ac
parent 89326d6a3ed8f86d46cd00099253e425838a28d3

Disallow compiling platform builds with desugared library.

Bug: b/232073181
Change-Id: I56fcee6c274b15738b82133227c5074f1e04a437

src/main/java/com/android/tools/r8/BaseCompilerCommand.java

diff --git a/src/main/java/com/android/tools/r8/BaseCompilerCommand.java b/src/main/java/com/android/tools/r8/BaseCompilerCommand.java
index 1694c22..02e06d1 100644
--- a/src/main/java/com/android/tools/r8/BaseCompilerCommand.java
+++ b/src/main/java/com/android/tools/r8/BaseCompilerCommand.java
@@ -763,6 +763,9 @@
                   + " or earlier");
         }
       }
+      if (hasDesugaredLibraryConfiguration() && getAndroidPlatformBuild()) {
+        reporter.error("Android platform builds cannot use desugared library");
+      }
       super.validate();
     }