Fix feature splits not registering data resource providers
This was preventing optimization of ServiceLoader.load calls in Chrome
because all non-base splits had null data resource providers.
Bug: b/364448981
Change-Id: I19304eaa2c789a44ef5ddc670bdfe1673d40fea2
diff --git a/src/main/java/com/android/tools/r8/R8CommandParser.java b/src/main/java/com/android/tools/r8/R8CommandParser.java
index 7a93728..c5fc86b 100644
--- a/src/main/java/com/android/tools/r8/R8CommandParser.java
+++ b/src/main/java/com/android/tools/r8/R8CommandParser.java
@@ -13,6 +13,7 @@
import com.android.tools.r8.profile.art.ArtProfileConsumerUtils;
import com.android.tools.r8.profile.art.ArtProfileProviderUtils;
import com.android.tools.r8.profile.startup.StartupProfileProviderUtils;
+import com.android.tools.r8.utils.ArchiveResourceProvider;
import com.android.tools.r8.utils.FlagFile;
import com.android.tools.r8.utils.MapIdTemplateProvider;
import com.android.tools.r8.utils.SourceFileTemplateProvider;
@@ -395,7 +396,7 @@
}
for (Path inputPath : featureSplitConfig.inputJars) {
featureSplitGenerator.addProgramResourceProvider(
- ArchiveProgramResourceProvider.fromArchive(inputPath));
+ ArchiveResourceProvider.fromArchive(inputPath, false));
}
if (featureSplitConfig.inputResources != null) {
featureSplitGenerator.setAndroidResourceProvider(