commit 6b0512247d02d65ce53fcff65b05471ee0cf92e0
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Feb 28 13:55:56 2023 +0100
committer Christoffer Adamsen <christofferqa@google.com> Wed Mar 01 07:56:04 2023 +0000
tree 6b17a3c187026de68f55124800833db32d3e763e
parent a4aed2791cabc9d4267e8e8656347790294112d2

Validate that min API is at least L with D8 relayout

Fixes: b/268451393
Change-Id: Ib456c73c1ef02b8b678ca805b93caf1470a1adb8

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

diff --git a/src/main/java/com/android/tools/r8/D8Command.java b/src/main/java/com/android/tools/r8/D8Command.java
index 0f8380d..a12e730 100644
--- a/src/main/java/com/android/tools/r8/D8Command.java
+++ b/src/main/java/com/android/tools/r8/D8Command.java
@@ -402,6 +402,13 @@
           && isMinApiLevelSet()) {
         reporter.error("Compiling to CF with --min-api and --no-desugaring is not supported");
       }
+      if (!getStartupProfileProviders().isEmpty()
+          && getMinApiLevel() < AndroidApiLevel.L.getLevel()) {
+        reporter.error(
+            "D8 startup layout requires native multi dex support (API level "
+                + AndroidApiLevel.L.getLevel()
+                + " and above)");
+      }
       super.validate();
     }