Revert "Never output META-INF/MANIFEST.MF files"
This reverts commit 81eff38d03653563693b6a25c2ad2ce6f1870a59.
Reason for revert: Test failures
Change-Id: I552b6c12153a47c6ad1ff9b050730bf2dff641cf
diff --git a/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java b/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
index 9c60f8d..316020f 100644
--- a/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
+++ b/src/main/java/com/android/tools/r8/dex/ApplicationWriter.java
@@ -756,9 +756,8 @@
@Override
public void visit(DataEntryResource file) {
- if ("META-INF/MANIFEST.MF".equals(file.getName())) {
- // Many android library input .jar files contain a MANIFEST.MF. It does not make
- // sense to propagate them since they are manifests of the input libraries.
+ if (resourceAdapter.isService(file)) {
+ // META-INF/services resources are handled below.
return;
}
if (kotlinModuleSynthesizer.isKotlinModuleFile(file)) {