Remove keepInterfaceMethod flag
Change-Id: I82042d23bd0ce8a8d13589df4196156e6543e69f
diff --git a/src/main/java/com/android/tools/r8/L8.java b/src/main/java/com/android/tools/r8/L8.java
index dcb4f9a..28713e3 100644
--- a/src/main/java/com/android/tools/r8/L8.java
+++ b/src/main/java/com/android/tools/r8/L8.java
@@ -90,9 +90,6 @@
});
if (shrink) {
InternalOptions r8Options = r8Command.getInternalOptions();
- // TODO(b/143590191): Remove the hack and make it work by default.
- // Temporary hack so that keeping an interface keeps the superinterfaces.
- r8Options.testing.keepInheritedInterfaceMethods = true;
// Disable outlining for R8 when called from L8.
r8Options.outline.enabled = false;
R8.runForTesting(r8Command.getInputApp(), r8Options);
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index be9ebfd..99afef9 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -1004,7 +1004,6 @@
public PrintStream whyAreYouNotInliningConsumer = System.out;
public boolean trackDesugaredAPIConversions =
System.getProperty("com.android.tools.r8.trackDesugaredAPIConversions") != null;
- public boolean keepInheritedInterfaceMethods = false;
// TODO(b/144781417): This is disabled by default as some test apps appear to have such classes.
public boolean allowNonAbstractClassesWithAbstractMethods = true;
