Don't run DexFileMergerTest as it is not supported for all r8.jar's

RELNOTES: None PiperOrigin-RevId: 327180192
bazelbuild · Aug 18, 2020 · 7a11752 · 7a11752
1 parent 9993785
commit 7a11752
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/test/java/com/google/devtools/build/android/r8/BUILD b/src/test/java/com/google/devtools/build/android/r8/BUILD
@@ -22,6 +22,7 @@ java_library(
         "//external:has_androidsdk": glob(
             ["*Test.java"],
             exclude = [
+                "DexFileMergerTest.java",
                 "NoAndroidSdkStubTest.java",
                 "AllTests.java",
             ],

diff --git a/src/test/java/com/google/devtools/build/android/r8/DexFileMergerTest.java b/src/test/java/com/google/devtools/build/android/r8/DexFileMergerTest.java
@@ -43,8 +43,6 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-// import com.android.tools.r8.maindexlist.MainDexListTests;
-
 /** Test for DexFileMerger. */
 @RunWith(JUnit4.class)
 public class DexFileMergerTest {