commit cda70dacc15a05070032592dfc1ebf83e2cc1f62
author Christoffer Quist Adamsen <christofferqa@google.com> Wed Feb 26 18:50:52 2020 +0100
committer Christoffer Quist Adamsen <christofferqa@google.com> Wed Feb 26 18:53:52 2020 +0000
tree 96ab4429b1455df4b1fd5b31b5b9be672b3b51e3
parent ea4b734c7cccf31d345287b02c70357fe4ac15ac

Add main dex rules to YouTube 14.44 test

Change-Id: I2f00488b9b74381e774cc202e57c00dc36186b2f

src/test/java/com/android/tools/r8/internal/YouTubeCompilationBase.java

diff --git a/src/test/java/com/android/tools/r8/internal/YouTubeCompilationBase.java b/src/test/java/com/android/tools/r8/internal/YouTubeCompilationBase.java
index df8bcb0..fdfad81 100644
--- a/src/test/java/com/android/tools/r8/internal/YouTubeCompilationBase.java
+++ b/src/test/java/com/android/tools/r8/internal/YouTubeCompilationBase.java
@@ -38,6 +38,13 @@
     return ImmutableList.of(Paths.get(base, "legacy_YouTubeRelease_combined_library_jars.jar"));
   }
 
+  protected List<Path> getMainDexRuleFiles() {
+    return ImmutableList.of(
+        Paths.get(base).resolve("mainDexClasses.rules"),
+        Paths.get(base).resolve("main-dex-classes-release-optimized.pgcfg"),
+        Paths.get(base).resolve("main_dex_YouTubeRelease_proguard.cfg"));
+  }
+
   protected List<Path> getProgramFiles() throws IOException {
     List<Path> result = new ArrayList<>();
     for (Path keepRuleFile : getKeepRuleFiles()) {

src/test/java/com/android/tools/r8/internal/YouTubeV1444TreeShakeJarVerificationTest.java

diff --git a/src/test/java/com/android/tools/r8/internal/YouTubeV1444TreeShakeJarVerificationTest.java b/src/test/java/com/android/tools/r8/internal/YouTubeV1444TreeShakeJarVerificationTest.java
index 73da9f2..770c97d 100644
--- a/src/test/java/com/android/tools/r8/internal/YouTubeV1444TreeShakeJarVerificationTest.java
+++ b/src/test/java/com/android/tools/r8/internal/YouTubeV1444TreeShakeJarVerificationTest.java
@@ -56,6 +56,7 @@
             .addProgramFiles(getProgramFiles())
             .addLibraryFiles(librarySanitizer.getSanitizedLibrary())
             .addKeepRuleFiles(getKeepRuleFiles())
+            .addMainDexRuleFiles(getMainDexRuleFiles())
             .addOptionsModification(
                 options -> {
                   assert !options.enableFieldBitAccessAnalysis;