Revert "Companion class must be public"
This reverts commit 69dbb169e769daca19082ee5e27a68f692124b26.
Change-Id: Ia7f1fc73a3c743c0b26f91f754ca23fe9ef3a4db
diff --git a/src/main/java/com/android/tools/r8/ir/desugar/InterfaceProcessor.java b/src/main/java/com/android/tools/r8/ir/desugar/InterfaceProcessor.java
index 66cd7d9..772d74c 100644
--- a/src/main/java/com/android/tools/r8/ir/desugar/InterfaceProcessor.java
+++ b/src/main/java/com/android/tools/r8/ir/desugar/InterfaceProcessor.java
@@ -121,8 +121,6 @@
companionClassFlags.unsetInterface();
companionClassFlags.setFinal();
companionClassFlags.setSynthetic();
- // Companion class must be public so moved methods can be called from anywhere.
- companionClassFlags.setPublic();
// Create companion class.
DexType companionClassType = rewriter.getCompanionClassType(iface.type);
diff --git a/src/test/examplesAndroidN/interfacemethods/DefaultMethods.java b/src/test/examplesAndroidN/interfacemethods/DefaultMethods.java
index 25e3fea..ef49f4e 100644
--- a/src/test/examplesAndroidN/interfacemethods/DefaultMethods.java
+++ b/src/test/examplesAndroidN/interfacemethods/DefaultMethods.java
@@ -4,8 +4,6 @@
package interfacemethods;
-import interfacemethods.p1.I4;
-
public class DefaultMethods {
interface I3 {
@@ -24,12 +22,8 @@
static class C4 extends C3 implements I3 {
}
- static class C5 implements I4 {
- }
-
public static void main(String[] args) {
new C2().d1();
System.out.println(new C4().getValue());
- new C5().dump();
}
}
diff --git a/src/test/examplesAndroidN/interfacemethods/p1/I3.java b/src/test/examplesAndroidN/interfacemethods/p1/I3.java
deleted file mode 100644
index f956279..0000000
--- a/src/test/examplesAndroidN/interfacemethods/p1/I3.java
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2017, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-package interfacemethods.p1;
-
-interface I3 {
-
- default void dump() {
- System.out.println("I3");
- }
-}
diff --git a/src/test/examplesAndroidN/interfacemethods/p1/I4.java b/src/test/examplesAndroidN/interfacemethods/p1/I4.java
deleted file mode 100644
index 1bb946b..0000000
--- a/src/test/examplesAndroidN/interfacemethods/p1/I4.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2017, the R8 project authors. Please see the AUTHORS file
-// for details. All rights reserved. Use of this source code is governed by a
-// BSD-style license that can be found in the LICENSE file.
-
-package interfacemethods.p1;
-
-public interface I4 extends I3 {
-}
