Fix Youtube compilation tests
Revert invalid library file change
Fix red bots
Change-Id: I092923017b9be0d88e09b8e4fbd4711aebd2a91f
diff --git a/src/test/java/com/android/tools/r8/internal/YouTubeCompilationTestBase.java b/src/test/java/com/android/tools/r8/internal/YouTubeCompilationTestBase.java
index 2da833c..f280e80 100644
--- a/src/test/java/com/android/tools/r8/internal/YouTubeCompilationTestBase.java
+++ b/src/test/java/com/android/tools/r8/internal/YouTubeCompilationTestBase.java
@@ -101,7 +101,7 @@
}
Path getLibraryFileWithoutDesugaredLibrary() throws IOException {
- Path libraryFile = ToolHelper.getAndroidJar(AndroidApiLevel.R);
+ Path libraryFile = getLibraryFile();
Path filteredLibraryFile =
Paths.get(libraryFile.toString().replace(".jar", "desugared_lib_filtered.jar"));
ArchiveConsumer consumer = new ArchiveConsumer(filteredLibraryFile);
diff --git a/src/test/java/com/android/tools/r8/internal/YouTubeV1533TreeShakeJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/YouTubeV1533TreeShakeJarVerificationTest.java
index 50cb980..9ae3939 100644
--- a/src/test/java/com/android/tools/r8/internal/YouTubeV1533TreeShakeJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/YouTubeV1533TreeShakeJarVerificationTest.java
@@ -11,7 +11,6 @@
import com.android.tools.r8.R8TestCompileResult;
import com.android.tools.r8.TestParameters;
import com.android.tools.r8.TestParametersCollection;
-import com.android.tools.r8.ToolHelper;
import com.android.tools.r8.utils.AndroidApiLevel;
import com.google.common.collect.ImmutableList;
import java.nio.file.Paths;
@@ -45,7 +44,7 @@
LibrarySanitizer librarySanitizer =
new LibrarySanitizer(temp)
.addProgramFiles(getProgramFiles())
- .addLibraryFiles(ImmutableList.of(ToolHelper.getAndroidJar(AndroidApiLevel.R)))
+ .addLibraryFiles(ImmutableList.of(getLibraryFile()))
.sanitize()
.assertSanitizedProguardConfigurationIsEmpty();
