commit 5e5a43f788c5f4989c6c54b424d53412a8826d2e
author Ian Zerny <zerny@google.com> Mon May 02 11:21:08 2022 +0200
committer Ian Zerny <zerny@google.com> Mon May 02 11:21:08 2022 +0200
tree a888e8db487fd82aa418a1323171621d84ea73bf
parent 9aafbd555495d655524b5f4a32b943f691d37296

Fix missing global synthetic strategy setup in DexSplitter.

Change-Id: Ide7e5bb388f9752deaa97b4ef462bc7730146c5d

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

diff --git a/src/main/java/com/android/tools/r8/DexSplitterHelper.java b/src/main/java/com/android/tools/r8/DexSplitterHelper.java
index a7ac9e3..b90b736 100644
--- a/src/main/java/com/android/tools/r8/DexSplitterHelper.java
+++ b/src/main/java/com/android/tools/r8/DexSplitterHelper.java
@@ -18,6 +18,7 @@
 import com.android.tools.r8.naming.ClassNameMapper;
 import com.android.tools.r8.naming.NamingLens;
 import com.android.tools.r8.shaking.MainDexInfo;
+import com.android.tools.r8.synthesis.SyntheticItems.GlobalSyntheticsStrategy;
 import com.android.tools.r8.utils.ExceptionUtils;
 import com.android.tools.r8.utils.FeatureClassMapping;
 import com.android.tools.r8.utils.FeatureClassMapping.FeatureMappingException;
@@ -92,8 +93,10 @@
         // If this is the base, we add the main dex list.
         AppInfo appInfo =
             feature.equals(featureClassMapping.getBaseName())
-                ? AppInfo.createInitialAppInfo(featureApp, mainDexInfo)
-                : AppInfo.createInitialAppInfo(featureApp);
+                ? AppInfo.createInitialAppInfo(
+                    featureApp, GlobalSyntheticsStrategy.forNonSynthesizing(), mainDexInfo)
+                : AppInfo.createInitialAppInfo(
+                    featureApp, GlobalSyntheticsStrategy.forNonSynthesizing());
         AppView<AppInfo> appView = AppView.createForD8(appInfo);
 
         // Run d8 optimize to ensure jumbo strings are handled.