commit fe76bd080bf8a474fb9aefe0b11dec006263acdf
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Sep 27 07:58:24 2023 +0200
committer Christoffer Adamsen <christofferqa@google.com> Wed Sep 27 06:14:45 2023 +0000
tree df60efdb0c3aa47e8c7a26d9ef6a7c313ad4cae8
parent 7deaeba48f036e6ff26e768581f1e38159b68433

Check if api modeling is enabled in class merger

Fixes: b/302074362
Change-Id: I6c9d7c17f87b9d7729293b02735955fa05739cd3

src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java

diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java
index 507396f..06117ec 100644
--- a/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java
+++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/ClassMerger.java
@@ -134,7 +134,10 @@
         newMethodReference.withName("$r8$clinit$synthetic", dexItemFactory);
     lensBuilder.recordNewMethodSignature(syntheticMethodReference, newMethodReference, true);
 
-    ComputedApiLevel apiReferenceLevel = classInitializerMerger.getApiReferenceLevel(appView);
+    ComputedApiLevel apiReferenceLevel =
+        appView.options().apiModelingOptions().isApiLibraryModelingEnabled()
+            ? classInitializerMerger.getApiReferenceLevel(appView)
+            : ComputedApiLevel.notSet();
     DexEncodedMethod definition =
         DexEncodedMethod.syntheticBuilder()
             .setMethod(newMethodReference)