Merge "Remove rules for services for building r8 processed r8 jars"
diff --git a/src/main/keep-compatdx.txt b/src/main/keep-compatdx.txt
index 7275f7f..75a8012 100644
--- a/src/main/keep-compatdx.txt
+++ b/src/main/keep-compatdx.txt
@@ -4,13 +4,3 @@
-keep public class com.android.tools.r8.compatdx.CompatDx { public static void main(java.lang.String[]); }
-keepattributes LineNumberTable
-
-# JvmMetadataExtensions must be kept because it'll be used indirectly through java.util.ServiceLoader.
--keep, allowobfuscation public class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions { public <init>(); }
-
-# For now we need to keep MetadataExtensions to avoid minifying (obfuscating) the name, because
-# '-adaptresourcefilenames' doesn't rename it (the package name is not encoded in directories).
--keep public class com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions { }
-
-# The contents of this file is ...JvmMetadataExtensions, which is renamed.
--adaptresourcefilecontents META-INF/services/com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions
diff --git a/src/main/keep-compatproguard.txt b/src/main/keep-compatproguard.txt
index 7944c1a..e29d13e 100644
--- a/src/main/keep-compatproguard.txt
+++ b/src/main/keep-compatproguard.txt
@@ -4,13 +4,3 @@
-keep public class com.android.tools.r8.compatproguard.CompatProguard { public static void main(java.lang.String[]); }
-keepattributes LineNumberTable
-
-# JvmMetadataExtensions must be kept because it'll be used indirectly through java.util.ServiceLoader.
--keep, allowobfuscation public class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions { public <init>(); }
-
-# For now we need to keep MetadataExtensions to avoid minifying (obfuscating) the name, because
-# '-adaptresourcefilenames' doesn't rename it (the package name is not encoded in directories).
--keep public class com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions { }
-
-# The contents of this file is ...JvmMetadataExtensions, which is renamed.
--adaptresourcefilecontents META-INF/services/com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions
diff --git a/src/main/keep.txt b/src/main/keep.txt
index 306a398..12b6447 100644
--- a/src/main/keep.txt
+++ b/src/main/keep.txt
@@ -16,14 +16,4 @@
-keep public class com.android.tools.r8.dexsplitter.DexSplitter { public static void main(java.lang.String[]); }
-keep public class com.android.tools.r8.Version { public static java.lang.String getVersionString(); }
-# JvmMetadataExtensions must be kept because it'll be used indirectly through java.util.ServiceLoader.
--keep, allowobfuscation public class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions { public <init>(); }
-
-# For now we need to keep MetadataExtensions to avoid minifying (obfuscating) the name, because
-# '-adaptresourcefilenames' doesn't rename it (the package name is not encoded in directories).
--keep public class com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions { }
-
-# The contents of this file is ...JvmMetadataExtensions, which is renamed.
--adaptresourcefilecontents META-INF/services/com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions
-
-keepattributes LineNumberTable, InnerClasses, EnclosingMethod, Exceptions, Signature
