commit 6fe706dcc1edd6cc06d583a59ec18919523a47f3
author Christoffer Quist Adamsen <christofferqa@google.com> Fri May 21 08:49:12 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Fri May 21 09:05:57 2021 +0000
tree a48e31d64e06657f78e562687f34b8f6c1ddd985
parent 8a5559bcf40443ebd0f4f4633014fe096e5d5022

Reland "Enable interface merging in second round of class merging"

This reverts commit 1188c195bc5fb277e7cd59572c674bb06ba23f6a.

Change-Id: Ia47dba6af52493305bb287e33bd20f069f045369

src/test/examples/classmerging/SimpleInterfaceAccessTest.java

diff --git a/src/test/examples/classmerging/SimpleInterfaceAccessTest.java b/src/test/examples/classmerging/SimpleInterfaceAccessTest.java
index 6fde90e..804b4ed 100644
--- a/src/test/examples/classmerging/SimpleInterfaceAccessTest.java
+++ b/src/test/examples/classmerging/SimpleInterfaceAccessTest.java
@@ -32,12 +32,14 @@
   }
 
   // Should only be merged into OtherSimpleInterfaceImpl if access modifications are allowed.
+  @NoHorizontalClassMerging
   public interface SimpleInterface {
 
     void foo();
   }
 
   // Should only be merged into OtherSimpleInterfaceImpl if access modifications are allowed.
+  @NoHorizontalClassMerging
   public interface OtherSimpleInterface {
 
     void bar();