Google Git
Sign in
r8/r8/b57cedf387c24caf77e23381f5804c34a24716d7^!/.
commit
b57cedf387c24caf77e23381f5804c34a24716d7
[log]
author
Jonathan Starup <jonathanlist@google.com>
Mon Jun 22 10:34:23 2026 +0000
committer
r8-scoped@luci-project-accounts.iam.gserviceaccount.com <r8-scoped@luci-project-accounts.iam.gserviceaccount.com>
Mon Jun 22 06:44:58 2026 -0700
tree
ce9a51103a4fab62aba8c58db0a82bac1605ba03
parent
a1c29e0c8846d20e687eb125e9ad66c71ae92072 [diff]
Move retrace tests into their own module.

Bug: b/518716827
Change-Id: Ib2a92f3f69cb8f299b4bf45194d8d4a7e6749011
diff --git a/d8_r8/test_modules/tests_java_8/retrace/build.gradle.kts b/d8_r8/test_modules/tests_java_8/retrace/build.gradle.kts
new file mode 100644
index 0000000..f7128cf
--- /dev/null
+++ b/d8_r8/test_modules/tests_java_8/retrace/build.gradle.kts

@@ -0,0 +1,26 @@
+// Copyright (c) 2026, 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.
+
+import org.gradle.api.tasks.Copy
+
+java {
+  sourceSets.test.configure {
+    java.srcDir(getRoot().resolveAll("src", "test", "java8", "retrace"))
+  }
+}
+
+tasks {
+  named<Copy>("processTestResources") {
+    from(sourceSets.test.get().java.srcDirs) {
+      include("com/android/tools/r8/retrace/kt/InlineFunction.kt")
+      include("com/android/tools/r8/retrace/kt/InlineFunctionsInSameFile.kt")
+      include("com/android/tools/r8/retrace/kt/Main.kt")
+      include("com/android/tools/r8/retrace/kt/MainInstance.kt")
+      include("com/android/tools/r8/retrace/kt/MainNested.kt")
+      include("com/android/tools/r8/retrace/kt/MainNestedFirstLine.kt")
+      include("com/android/tools/r8/retrace/kt/MainWithMultipleInlines.kt")
+      include("com/android/tools/r8/retrace/kt/NestedInlineFunction.kt")
+    }
+  }
+}

diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2ad28b8..442a2a9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts

@@ -57,6 +57,7 @@
 includeTestProject(":tests_java_8:naming")
 includeTestProject(":tests_java_8:kotlin")
 includeTestProject(":tests_java_8:keepanno")
+includeTestProject(":tests_java_8:retrace")
 includeTestProject(":tests_java_11")
 includeTestProject(":tests_java_17")
 includeTestProject(":tests_java_21")

diff --git a/src/test/java/com/android/tools/r8/annotations/SourceDebugExtensionTest.java b/src/test/java8/retrace/com/android/tools/r8/annotations/SourceDebugExtensionTest.java
similarity index 95%
rename from src/test/java/com/android/tools/r8/annotations/SourceDebugExtensionTest.java
rename to src/test/java8/retrace/com/android/tools/r8/annotations/SourceDebugExtensionTest.java
index 5bc862d..8235f8c 100644
--- a/src/test/java/com/android/tools/r8/annotations/SourceDebugExtensionTest.java
+++ b/src/test/java8/retrace/com/android/tools/r8/annotations/SourceDebugExtensionTest.java

@@ -57,9 +57,7 @@
                 kotlinc,
                 kotlinTestParameters.getTargetVersion(),
                 kotlinTestParameters.getLambdaGeneration())
-            .addSourceFiles(
-                getFilesInTestFolderRelativeToClass(
-                    KotlinInlineFunctionRetraceTest.class, "kt", ".kt"))
+            .addSourceFiles(KotlinInlineFunctionRetraceTest.getKotlinSources())
             .compile();
     CodeInspector kotlinInspector = new CodeInspector(kotlinSources);
     inspectSourceDebugExtension(kotlinInspector);

diff --git a/src/test/java/com/android/tools/r8/internal/retrace/RetraceTests.java b/src/test/java8/retrace/com/android/tools/r8/internal/retrace/RetraceTests.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/internal/retrace/RetraceTests.java
rename to src/test/java8/retrace/com/android/tools/r8/internal/retrace/RetraceTests.java

diff --git a/src/test/java/com/android/tools/r8/internal/retrace/stacktraces/CronetStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/internal/retrace/stacktraces/CronetStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/internal/retrace/stacktraces/CronetStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/internal/retrace/stacktraces/CronetStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/internal/retrace/stacktraces/FinskyStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/internal/retrace/stacktraces/FinskyStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/internal/retrace/stacktraces/FinskyStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/internal/retrace/stacktraces/FinskyStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/internal/retrace/stacktraces/RetraceInternalStackTraceForTest.java b/src/test/java8/retrace/com/android/tools/r8/internal/retrace/stacktraces/RetraceInternalStackTraceForTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/internal/retrace/stacktraces/RetraceInternalStackTraceForTest.java
rename to src/test/java8/retrace/com/android/tools/r8/internal/retrace/stacktraces/RetraceInternalStackTraceForTest.java

diff --git a/src/test/java/com/android/tools/r8/internal/retrace/stacktraces/VelvetStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/internal/retrace/stacktraces/VelvetStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/internal/retrace/stacktraces/VelvetStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/internal/retrace/stacktraces/VelvetStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/DuplicateMappingsTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/DuplicateMappingsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/DuplicateMappingsTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/DuplicateMappingsTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/HorizontalMergingWithMergedClassesMappingTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/HorizontalMergingWithMergedClassesMappingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/HorizontalMergingWithMergedClassesMappingTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/HorizontalMergingWithMergedClassesMappingTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/HorizontalMergingWithTryCatchLineNumberTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/HorizontalMergingWithTryCatchLineNumberTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/HorizontalMergingWithTryCatchLineNumberTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/HorizontalMergingWithTryCatchLineNumberTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/InlineFunctionInPrunedClassTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/InlineFunctionInPrunedClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/InlineFunctionInPrunedClassTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/InlineFunctionInPrunedClassTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/InlineWithoutNullCheckTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/InlineWithoutNullCheckTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/InlineWithoutNullCheckTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/InlineWithoutNullCheckTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/InvalidMappingRangesB309080420Test.java b/src/test/java8/retrace/com/android/tools/r8/retrace/InvalidMappingRangesB309080420Test.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/InvalidMappingRangesB309080420Test.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/InvalidMappingRangesB309080420Test.java

diff --git a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java b/src/test/java8/retrace/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
similarity index 96%
rename from src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
index 0ea5adb..2fbd7b9 100644
--- a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java
+++ b/src/test/java8/retrace/com/android/tools/r8/retrace/KotlinInlineFunctionInSameFileRetraceTests.java

@@ -63,12 +63,7 @@
       getCompileMemoizer(getKotlinSources());
 
   private static Collection<Path> getKotlinSources() {
-    try {
-      return getFilesInTestFolderRelativeToClass(
-          KotlinInlineFunctionRetraceTest.class, "kt", ".kt");
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+    return KotlinInlineFunctionRetraceTest.getKotlinSources();
   }
 
   private int getObfuscatedLinePosition() {

diff --git a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
similarity index 94%
rename from src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
index 6be2de7..456edb9 100644
--- a/src/test/java/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java
+++ b/src/test/java8/retrace/com/android/tools/r8/retrace/KotlinInlineFunctionRetraceTest.java

@@ -62,13 +62,22 @@
   private static final KotlinCompileMemoizer compilationResults =
       getCompileMemoizer(getKotlinSources());
 
-  private static Collection<Path> getKotlinSources() {
-    try {
-      return getFilesInTestFolderRelativeToClass(
-          KotlinInlineFunctionRetraceTest.class, "kt", ".kt");
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+  public static Collection<Path> getKotlinSources() {
+    List<String> files =
+        com.google.common.collect.ImmutableList.of(
+            "InlineFunction.kt",
+            "InlineFunctionsInSameFile.kt",
+            "Main.kt",
+            "MainInstance.kt",
+            "MainNested.kt",
+            "MainNestedFirstLine.kt",
+            "MainWithMultipleInlines.kt",
+            "NestedInlineFunction.kt");
+    return ListUtils.map(
+        files,
+        name ->
+            com.android.tools.r8.ToolHelper.getResourceAsTempFile(
+                KotlinInlineFunctionRetraceTest.class, "kt/" + name));
   }
 
   private FoundMethodSubject inlineExceptionStatic(CodeInspector kotlinInspector) {

diff --git a/src/test/java/com/android/tools/r8/retrace/OverloadsWithoutLineNumberTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/OverloadsWithoutLineNumberTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/OverloadsWithoutLineNumberTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/OverloadsWithoutLineNumberTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/PartitionCommandParserTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/PartitionCommandParserTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/PartitionCommandParserTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/PartitionCommandParserTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/ProxyRetraceAmbiguousTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/ProxyRetraceAmbiguousTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/ProxyRetraceAmbiguousTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/ProxyRetraceAmbiguousTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/ProxyRetraceOutlineTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/ProxyRetraceOutlineTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/ProxyRetraceOutlineTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/ProxyRetraceOutlineTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RenamedSignatureClashTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RenamedSignatureClashTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RenamedSignatureClashTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RenamedSignatureClashTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceBackportMethodClass.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceBackportMethodClass.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceBackportMethodClass.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceBackportMethodClass.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceBackportMethodTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceBackportMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceBackportMethodTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceBackportMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceCommandLineTests.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceCommandLineTests.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceCommandLineTests.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceCommandLineTests.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceCompanionWithPreambleTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceCompanionWithPreambleTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceCompanionWithPreambleTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceCompanionWithPreambleTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceFieldTests.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceFieldTests.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceFieldTests.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceFieldTests.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceIdentifiersWithNumbersTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceIdentifiersWithNumbersTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceIdentifiersWithNumbersTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceIdentifiersWithNumbersTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceInvalidResidualSignatureTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceInvalidResidualSignatureTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceInvalidResidualSignatureTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceInvalidResidualSignatureTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceLambdaTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceLambdaTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceLambdaTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceLambdaTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceMappingWithOverloadsTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceMappingWithOverloadsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceMappingWithOverloadsTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceMappingWithOverloadsTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceNestAccessorTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceNestAccessorTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceNestAccessorTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceNestAccessorTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceNoProguardMapTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceNoProguardMapTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceNoProguardMapTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceNoProguardMapTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullClass.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullClass.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullClass.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullClass.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceObjectsRequireNonNullTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceOutsideLineRangeTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceOutsideLineRangeTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceOutsideLineRangeTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceOutsideLineRangeTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceSynthesizedInnerFrameTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceSynthesizedInnerFrameTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceSynthesizedInnerFrameTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceSynthesizedInnerFrameTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceSyntheticClassWithNonSyntheticMethodTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceSyntheticClassWithNonSyntheticMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceSyntheticClassWithNonSyntheticMethodTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceSyntheticClassWithNonSyntheticMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceTests.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceTests.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceTests.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceTests.java

diff --git a/src/test/java/com/android/tools/r8/retrace/RetraceWhitespaceTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/RetraceWhitespaceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/RetraceWhitespaceTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/RetraceWhitespaceTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/SourceFileTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/SourceFileTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/SourceFileTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/SourceFileTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/StackTraceRegularExpressionParserTests.java b/src/test/java8/retrace/com/android/tools/r8/retrace/StackTraceRegularExpressionParserTests.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/StackTraceRegularExpressionParserTests.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/StackTraceRegularExpressionParserTests.java

diff --git a/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTestRunner.java b/src/test/java8/retrace/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTestRunner.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTestRunner.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/StackTraceWithPcAndJumboStringTestRunner.java

diff --git a/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTestRunner.java b/src/test/java8/retrace/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTestRunner.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTestRunner.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/StackTraceWithPcAndNoLineTableTestRunner.java

diff --git a/src/test/java/com/android/tools/r8/retrace/StringRetraceAmbiguousTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/StringRetraceAmbiguousTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/StringRetraceAmbiguousTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/StringRetraceAmbiguousTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/StringRetraceOutlineTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/StringRetraceOutlineTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/StringRetraceOutlineTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/StringRetraceOutlineTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiAmbiguousOriginalRangeTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiAmbiguousOriginalRangeTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiAmbiguousOriginalRangeTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiAmbiguousOriginalRangeTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiBinaryCompatibilityTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiBinaryCompatibilityTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiBinaryCompatibilityTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiBinaryCompatibilityTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiBinaryTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiBinaryTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiBinaryTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiBinaryTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiEmptyTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiEmptyTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiEmptyTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiEmptyTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiInferSourceFileTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiInferSourceFileTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiInferSourceFileTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiInferSourceFileTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiInlineInOutlineTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiInlineInOutlineTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiInlineInOutlineTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiInlineInOutlineTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiOutlineInOutlineStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiOutlineInOutlineStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiOutlineInOutlineStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiOutlineInOutlineStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiOutlineInlineTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiOutlineInlineTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiOutlineInlineTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiOutlineInlineTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiOutlineNoInlineTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiOutlineNoInlineTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiOutlineNoInlineTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiOutlineNoInlineTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiProxyFrameWithSourceFileTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiProxyFrameWithSourceFileTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiProxyFrameWithSourceFileTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiProxyFrameWithSourceFileTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiResidualSignatureTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiResidualSignatureTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiResidualSignatureTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiResidualSignatureTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiRewriteFrameInlineNpeResidualTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiRewriteFrameInlineNpeResidualTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiRewriteFrameInlineNpeResidualTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiRewriteFrameInlineNpeResidualTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiRewriteFrameInlineNpeTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiRewriteFrameInlineNpeTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiRewriteFrameInlineNpeTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiRewriteFrameInlineNpeTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiSingleFrameTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSingleFrameTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiSingleFrameTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSingleFrameTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiSourceFileNotFoundTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSourceFileNotFoundTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiSourceFileNotFoundTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSourceFileNotFoundTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiSourceFileTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSourceFileTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiSourceFileTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSourceFileTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiSynthesizedClassTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSynthesizedClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiSynthesizedClassTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSynthesizedClassTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiSynthesizedFieldTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSynthesizedFieldTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiSynthesizedFieldTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSynthesizedFieldTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiSynthesizedFrameTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSynthesizedFrameTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiSynthesizedFrameTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSynthesizedFrameTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiSynthesizedMethodTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSynthesizedMethodTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiSynthesizedMethodTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiSynthesizedMethodTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestBase.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiTestBase.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestBase.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiTestBase.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestCollection.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiTestCollection.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiTestCollection.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiTestCollection.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiTypeResultTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiTypeResultTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiTypeResultTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiTypeResultTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetraceApiUnknownJsonTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiUnknownJsonTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetraceApiUnknownJsonTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetraceApiUnknownJsonTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetracePartitionEmptyMappingTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionEmptyMappingTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetracePartitionEmptyMappingTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionEmptyMappingTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetracePartitionJoinNoMetadataTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionJoinNoMetadataTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetracePartitionJoinNoMetadataTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionJoinNoMetadataTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetracePartitionRoundTripInlineTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionRoundTripInlineTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetracePartitionRoundTripInlineTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionRoundTripInlineTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetracePartitionRoundTripTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionRoundTripTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetracePartitionRoundTripTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionRoundTripTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetracePartitionSerializedObfuscatedKeyTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionSerializedObfuscatedKeyTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetracePartitionSerializedObfuscatedKeyTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionSerializedObfuscatedKeyTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetracePartitionStackTracePromiseTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionStackTracePromiseTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetracePartitionStackTracePromiseTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionStackTracePromiseTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/api/RetracePartitionStringTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionStringTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/api/RetracePartitionStringTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/api/RetracePartitionStringTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/classes/SynthesizeLineNumber.java b/src/test/java8/retrace/com/android/tools/r8/retrace/classes/SynthesizeLineNumber.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/classes/SynthesizeLineNumber.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/classes/SynthesizeLineNumber.java

diff --git a/src/test/java/com/android/tools/r8/retrace/kt/InlineFunction.kt b/src/test/java8/retrace/com/android/tools/r8/retrace/kt/InlineFunction.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/kt/InlineFunction.kt
rename to src/test/java8/retrace/com/android/tools/r8/retrace/kt/InlineFunction.kt

diff --git a/src/test/java/com/android/tools/r8/retrace/kt/InlineFunctionsInSameFile.kt b/src/test/java8/retrace/com/android/tools/r8/retrace/kt/InlineFunctionsInSameFile.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/kt/InlineFunctionsInSameFile.kt
rename to src/test/java8/retrace/com/android/tools/r8/retrace/kt/InlineFunctionsInSameFile.kt

diff --git a/src/test/java/com/android/tools/r8/retrace/kt/Main.kt b/src/test/java8/retrace/com/android/tools/r8/retrace/kt/Main.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/kt/Main.kt
rename to src/test/java8/retrace/com/android/tools/r8/retrace/kt/Main.kt

diff --git a/src/test/java/com/android/tools/r8/retrace/kt/MainInstance.kt b/src/test/java8/retrace/com/android/tools/r8/retrace/kt/MainInstance.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/kt/MainInstance.kt
rename to src/test/java8/retrace/com/android/tools/r8/retrace/kt/MainInstance.kt

diff --git a/src/test/java/com/android/tools/r8/retrace/kt/MainNested.kt b/src/test/java8/retrace/com/android/tools/r8/retrace/kt/MainNested.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/kt/MainNested.kt
rename to src/test/java8/retrace/com/android/tools/r8/retrace/kt/MainNested.kt

diff --git a/src/test/java/com/android/tools/r8/retrace/kt/MainNestedFirstLine.kt b/src/test/java8/retrace/com/android/tools/r8/retrace/kt/MainNestedFirstLine.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/kt/MainNestedFirstLine.kt
rename to src/test/java8/retrace/com/android/tools/r8/retrace/kt/MainNestedFirstLine.kt

diff --git a/src/test/java/com/android/tools/r8/retrace/kt/MainWithMultipleInlines.kt b/src/test/java8/retrace/com/android/tools/r8/retrace/kt/MainWithMultipleInlines.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/kt/MainWithMultipleInlines.kt
rename to src/test/java8/retrace/com/android/tools/r8/retrace/kt/MainWithMultipleInlines.kt

diff --git a/src/test/java/com/android/tools/r8/retrace/kt/NestedInlineFunction.kt b/src/test/java8/retrace/com/android/tools/r8/retrace/kt/NestedInlineFunction.kt
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/kt/NestedInlineFunction.kt
rename to src/test/java8/retrace/com/android/tools/r8/retrace/kt/NestedInlineFunction.kt

diff --git a/src/test/java/com/android/tools/r8/retrace/mappings/FieldsWithSameMinifiedNameMapping.java b/src/test/java8/retrace/com/android/tools/r8/retrace/mappings/FieldsWithSameMinifiedNameMapping.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/mappings/FieldsWithSameMinifiedNameMapping.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/mappings/FieldsWithSameMinifiedNameMapping.java

diff --git a/src/test/java/com/android/tools/r8/retrace/mappings/MappingForTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/mappings/MappingForTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/mappings/MappingForTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/mappings/MappingForTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/MetadataCombineTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/MetadataCombineTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/MetadataCombineTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/MetadataCombineTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/PartitionMergeTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/PartitionMergeTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/PartitionMergeTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/PartitionMergeTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/R8ZipContainerMappingFileTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/R8ZipContainerMappingFileTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/R8ZipContainerMappingFileTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/R8ZipContainerMappingFileTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionAndJoinIdentityTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionAndJoinIdentityTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionAndJoinIdentityTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionAndJoinIdentityTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionFormatsTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionFormatsTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionFormatsTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionFormatsTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionMetadataPartitionNamesTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionMetadataPartitionNamesTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionMetadataPartitionNamesTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionMetadataPartitionNamesTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionMetadataUnknownTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionMetadataUnknownTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionMetadataUnknownTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionMetadataUnknownTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionMultipleOutlineClassTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionMultipleOutlineClassTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionMultipleOutlineClassTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionMultipleOutlineClassTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionNoMapVersionTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionNoMapVersionTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionNoMapVersionTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionNoMapVersionTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionTestUtils.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionTestUtils.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionTestUtils.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionTestUtils.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionWithPrimitiveNameTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionWithPrimitiveNameTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/RetracePartitionWithPrimitiveNameTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/RetracePartitionWithPrimitiveNameTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/partition/testclasses/R8ZipContainerMappingFileTestClasses.java b/src/test/java8/retrace/com/android/tools/r8/retrace/partition/testclasses/R8ZipContainerMappingFileTestClasses.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/partition/testclasses/R8ZipContainerMappingFileTestClasses.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/partition/testclasses/R8ZipContainerMappingFileTestClasses.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacksamples/HorizontalClassMergingStackSampleRetraceTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/HorizontalClassMergingStackSampleRetraceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacksamples/HorizontalClassMergingStackSampleRetraceTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/HorizontalClassMergingStackSampleRetraceTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacksamples/MethodWithInlinePositionsStackSampleRetraceTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/MethodWithInlinePositionsStackSampleRetraceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacksamples/MethodWithInlinePositionsStackSampleRetraceTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/MethodWithInlinePositionsStackSampleRetraceTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacksamples/MethodWithOverloadStackSampleRetraceTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/MethodWithOverloadStackSampleRetraceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacksamples/MethodWithOverloadStackSampleRetraceTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/MethodWithOverloadStackSampleRetraceTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacksamples/MethodWithRemovedArgumentStackSampleRetraceTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/MethodWithRemovedArgumentStackSampleRetraceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacksamples/MethodWithRemovedArgumentStackSampleRetraceTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/MethodWithRemovedArgumentStackSampleRetraceTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacksamples/StackSampleRetraceTestBase.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/StackSampleRetraceTestBase.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacksamples/StackSampleRetraceTestBase.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/StackSampleRetraceTestBase.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacksamples/StaticizedMethodStackSampleRetraceTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/StaticizedMethodStackSampleRetraceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacksamples/StaticizedMethodStackSampleRetraceTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/StaticizedMethodStackSampleRetraceTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacksamples/VerticalClassMergingStackSampleRetraceTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/VerticalClassMergingStackSampleRetraceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacksamples/VerticalClassMergingStackSampleRetraceTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacksamples/VerticalClassMergingStackSampleRetraceTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/ActualBotStackTraceBase.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ActualBotStackTraceBase.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/ActualBotStackTraceBase.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ActualBotStackTraceBase.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/ActualIdentityStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ActualIdentityStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/ActualIdentityStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ActualIdentityStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/ActualRetraceBotStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ActualRetraceBotStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/ActualRetraceBotStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ActualRetraceBotStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/ActualRetraceBotStackTraceWithInfo.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ActualRetraceBotStackTraceWithInfo.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/ActualRetraceBotStackTraceWithInfo.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ActualRetraceBotStackTraceWithInfo.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousInlineFramesStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousInlineFramesStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousInlineFramesStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousInlineFramesStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousMethodVerboseStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousMethodVerboseStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousMethodVerboseStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousMethodVerboseStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousMissingLineStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousMissingLineStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousMissingLineStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousMissingLineStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousMultipleInlineStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousMultipleInlineStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousMultipleInlineStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousMultipleInlineStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousWithMultipleLineMappingsStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousWithMultipleLineMappingsStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousWithMultipleLineMappingsStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousWithMultipleLineMappingsStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousWithSignatureStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousWithSignatureStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/AmbiguousWithSignatureStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AmbiguousWithSignatureStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/AutoStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AutoStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/AutoStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/AutoStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/CircularReferenceStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/CircularReferenceStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/CircularReferenceStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/CircularReferenceStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/ClassWithDashStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ClassWithDashStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/ClassWithDashStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ClassWithDashStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/ColonInFileNameStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ColonInFileNameStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/ColonInFileNameStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ColonInFileNameStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/DifferentLineNumberSpanStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/DifferentLineNumberSpanStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/DifferentLineNumberSpanStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/DifferentLineNumberSpanStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/ExceptionMessageWithClassNameInMessage.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ExceptionMessageWithClassNameInMessage.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/ExceptionMessageWithClassNameInMessage.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ExceptionMessageWithClassNameInMessage.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/FileNameExtensionStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/FileNameExtensionStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/FileNameExtensionStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/FileNameExtensionStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/FoundMethodVerboseStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/FoundMethodVerboseStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/FoundMethodVerboseStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/FoundMethodVerboseStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/IdentityMappingStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/IdentityMappingStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/IdentityMappingStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/IdentityMappingStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlineFileNameStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineFileNameStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlineFileNameStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineFileNameStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlineFileNameWithInnerClassesStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineFileNameWithInnerClassesStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlineFileNameWithInnerClassesStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineFileNameWithInnerClassesStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlineInOutlineStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineInOutlineStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlineInOutlineStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineInOutlineStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlineNoLineAssumeNoInlineAmbiguousStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineNoLineAssumeNoInlineAmbiguousStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlineNoLineAssumeNoInlineAmbiguousStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineNoLineAssumeNoInlineAmbiguousStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlineNoLineNumberAssumeNoInlineStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineNoLineNumberAssumeNoInlineStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlineNoLineNumberAssumeNoInlineStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineNoLineNumberAssumeNoInlineStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlineNoLineNumberStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineNoLineNumberStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlineNoLineNumberStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineNoLineNumberStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlineNoLineWithBaseEntryNumberAssumeNoInlineStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineNoLineWithBaseEntryNumberAssumeNoInlineStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlineNoLineWithBaseEntryNumberAssumeNoInlineStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineNoLineWithBaseEntryNumberAssumeNoInlineStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlinePreambleNoOriginalStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlinePreambleNoOriginalStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlinePreambleNoOriginalStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlinePreambleNoOriginalStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlineRemoveFrameJava17StackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineRemoveFrameJava17StackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlineRemoveFrameJava17StackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineRemoveFrameJava17StackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlineSourceFileContextStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineSourceFileContextStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlineSourceFileContextStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineSourceFileContextStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlineSourceFileStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineSourceFileStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlineSourceFileStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineSourceFileStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InlineWithLineNumbersStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineWithLineNumbersStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InlineWithLineNumbersStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InlineWithLineNumbersStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidMinifiedRangeStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InvalidMinifiedRangeStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidMinifiedRangeStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InvalidMinifiedRangeStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidOriginalRangeStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InvalidOriginalRangeStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidOriginalRangeStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InvalidOriginalRangeStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InvalidStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/InvalidStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/InvalidStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/LongLineStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/LongLineStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/LongLineStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/LongLineStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/MapVersionWarningStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MapVersionWarningStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/MapVersionWarningStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MapVersionWarningStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/MemberFieldOverlapStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MemberFieldOverlapStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/MemberFieldOverlapStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MemberFieldOverlapStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/MovedSynthetizedInfoStackTraceTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MovedSynthetizedInfoStackTraceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/MovedSynthetizedInfoStackTraceTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MovedSynthetizedInfoStackTraceTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/MultipleDotsInFileNameStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MultipleDotsInFileNameStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/MultipleDotsInFileNameStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MultipleDotsInFileNameStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/MultipleLinesNoLineNumberStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MultipleLinesNoLineNumberStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/MultipleLinesNoLineNumberStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MultipleLinesNoLineNumberStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/MultipleMapVersionsWarningStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MultipleMapVersionsWarningStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/MultipleMapVersionsWarningStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MultipleMapVersionsWarningStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/MultipleOriginalLinesNoLineNumberStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MultipleOriginalLinesNoLineNumberStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/MultipleOriginalLinesNoLineNumberStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/MultipleOriginalLinesNoLineNumberStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/NamedModuleStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/NamedModuleStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/NamedModuleStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/NamedModuleStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/NoObfuscatedLineNumberWithOverrideTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/NoObfuscatedLineNumberWithOverrideTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/NoObfuscatedLineNumberWithOverrideTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/NoObfuscatedLineNumberWithOverrideTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/NoObfuscationRangeMappingWithStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/NoObfuscationRangeMappingWithStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/NoObfuscationRangeMappingWithStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/NoObfuscationRangeMappingWithStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/NpeInlineRetraceStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/NpeInlineRetraceStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/NpeInlineRetraceStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/NpeInlineRetraceStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/NullStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/NullStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/NullStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/NullStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/ObfucatedExceptionClassStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ObfucatedExceptionClassStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/ObfucatedExceptionClassStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ObfucatedExceptionClassStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/ObfuscatedRangeToSingleLineStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ObfuscatedRangeToSingleLineStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/ObfuscatedRangeToSingleLineStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ObfuscatedRangeToSingleLineStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/OutlineInOutlineStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OutlineInOutlineStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/OutlineInOutlineStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OutlineInOutlineStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/OutlineSimpleStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OutlineSimpleStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/OutlineSimpleStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OutlineSimpleStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/OutlineWithInliningStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OutlineWithInliningStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/OutlineWithInliningStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OutlineWithInliningStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/OutsideLineRangeStackTraceTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OutsideLineRangeStackTraceTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/OutsideLineRangeStackTraceTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OutsideLineRangeStackTraceTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/OverloadSameLineTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OverloadSameLineTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/OverloadSameLineTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OverloadSameLineTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/OverloadedWithAndWithoutRangeStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OverloadedWithAndWithoutRangeStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/OverloadedWithAndWithoutRangeStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/OverloadedWithAndWithoutRangeStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/PGStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/PGStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/PGStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/PGStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/PreambleLineNumberStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/PreambleLineNumberStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/PreambleLineNumberStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/PreambleLineNumberStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/ResidualSignatureOnOuterFrameStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ResidualSignatureOnOuterFrameStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/ResidualSignatureOnOuterFrameStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/ResidualSignatureOnOuterFrameStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/RetraceAssertionErrorStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/RetraceAssertionErrorStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/RetraceAssertionErrorStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/RetraceAssertionErrorStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/SingleLineNoLineNumberStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SingleLineNoLineNumberStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/SingleLineNoLineNumberStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SingleLineNoLineNumberStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/SourceFileNameSynthesizeStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SourceFileNameSynthesizeStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/SourceFileNameSynthesizeStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SourceFileNameSynthesizeStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/SourceFileWithNumberAndEmptyStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SourceFileWithNumberAndEmptyStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/SourceFileWithNumberAndEmptyStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SourceFileWithNumberAndEmptyStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/StackTraceForTest.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/StackTraceForTest.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/StackTraceForTest.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/StackTraceForTest.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/SuppressedStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SuppressedStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/SuppressedStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SuppressedStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/SyntheticLambdaMethodStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SyntheticLambdaMethodStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/SyntheticLambdaMethodStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SyntheticLambdaMethodStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/SyntheticLambdaMethodWithInliningStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SyntheticLambdaMethodWithInliningStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/SyntheticLambdaMethodWithInliningStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/SyntheticLambdaMethodWithInliningStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/TrailingWhitespaceStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/TrailingWhitespaceStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/TrailingWhitespaceStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/TrailingWhitespaceStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/UnicodeInFileNameStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/UnicodeInFileNameStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/UnicodeInFileNameStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/UnicodeInFileNameStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/UnknownSourceStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/UnknownSourceStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/UnknownSourceStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/UnknownSourceStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/retrace/stacktraces/VerboseUnknownStackTrace.java b/src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/VerboseUnknownStackTrace.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/retrace/stacktraces/VerboseUnknownStackTrace.java
rename to src/test/java8/retrace/com/android/tools/r8/retrace/stacktraces/VerboseUnknownStackTrace.java

diff --git a/src/test/java/com/android/tools/r8/compilerapi/BinaryCompatibilityTestCollection.java b/src/test/testbase/java/com/android/tools/r8/compilerapi/BinaryCompatibilityTestCollection.java
similarity index 100%
rename from src/test/java/com/android/tools/r8/compilerapi/BinaryCompatibilityTestCollection.java
rename to src/test/testbase/java/com/android/tools/r8/compilerapi/BinaryCompatibilityTestCollection.java