commit ce24ab73d51b3778aa29f740eac50097dd853572
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Dec 10 15:47:34 2019 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Dec 11 10:09:32 2019 +0000
tree 9921e8cd57eacc72e363c6d2ffb53faec1b03417
parent 4a6cc7f317bd1b1968461b2688f51f6debbea91d

Fix missing overrides in TestBuilder

Change-Id: Ib28bfef7b1d933559b1cf9a1e5eaa04b4e0b1ae7

src/test/java/com/android/tools/r8/GenerateMainDexListTestBuilder.java

diff --git a/src/test/java/com/android/tools/r8/GenerateMainDexListTestBuilder.java b/src/test/java/com/android/tools/r8/GenerateMainDexListTestBuilder.java
index 3ceeb97..e0f3cea 100644
--- a/src/test/java/com/android/tools/r8/GenerateMainDexListTestBuilder.java
+++ b/src/test/java/com/android/tools/r8/GenerateMainDexListTestBuilder.java
@@ -46,6 +46,7 @@
     throw new Unimplemented("No support for running with a main class");
   }
 
+  @Override
   public DebugTestConfig debugConfig() {
     throw new Unimplemented("No support for debug configuration");
   }

src/test/java/com/android/tools/r8/JvmTestBuilder.java

diff --git a/src/test/java/com/android/tools/r8/JvmTestBuilder.java b/src/test/java/com/android/tools/r8/JvmTestBuilder.java
index e44287f..bef8a14 100644
--- a/src/test/java/com/android/tools/r8/JvmTestBuilder.java
+++ b/src/test/java/com/android/tools/r8/JvmTestBuilder.java
@@ -44,6 +44,7 @@
     return run(TestRuntime.getDefaultJavaRuntime(), mainClass);
   }
 
+  @Override
   public JvmTestRunResult run(TestRuntime runtime, String mainClass, String... args)
       throws IOException {
     assert runtime.isCf();

src/test/java/com/android/tools/r8/TestCompilerBuilder.java

diff --git a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
index af1b81e..3b368b6 100644
--- a/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
+++ b/src/test/java/com/android/tools/r8/TestCompilerBuilder.java
@@ -61,8 +61,6 @@
     }
   }
 
-  abstract T self();
-
   abstract CR internalCompile(
       B builder, Consumer<InternalOptions> optionsConsumer, Supplier<AndroidApp> app)
       throws CompilationFailedException;