commit 771388430553cd2e8a9561983d24d65442506829
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Mar 20 20:35:35 2023 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Mar 20 20:35:35 2023 +0100
tree 4eed5712d6ac385031327d009c06f206cc7ca479
parent b7b22190797c9b74218fb1d2fdfb497a9be9fb3b

[ApiModel] Disable new-instance outlining pre-L

Change-Id: Id53c7669a2d9330f44a6c52f9c5c6103a31111f8

src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index 7a15b25..fc8d1f2 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -75,6 +75,7 @@
 import com.android.tools.r8.shaking.KeepMethodInfo;
 import com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis;
 import com.android.tools.r8.utils.Action;
+import com.android.tools.r8.utils.AndroidApiLevel;
 import com.android.tools.r8.utils.DescriptorUtils;
 import com.android.tools.r8.utils.ExceptionUtils;
 import com.android.tools.r8.utils.InternalOptions;
@@ -220,7 +221,8 @@
             ? new CovariantReturnTypeAnnotationTransformer(appView, this)
             : null;
     if (appView.options().desugarState.isOn()
-        && appView.options().apiModelingOptions().enableOutliningOfMethods) {
+        && appView.options().apiModelingOptions().enableOutliningOfMethods
+        && appView.options().getMinApiLevel().isGreaterThanOrEqualTo(AndroidApiLevel.L)) {
       this.instanceInitializerOutliner = new InstanceInitializerOutliner(appView);
     } else {
       this.instanceInitializerOutliner = null;