1 files changed, 10 insertions, 12 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java b/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
index 042a5a42..0592546a 100644
--- a/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
+++ b/jack-tests/tests/com/android/jack/shrob/RepackagingTest.java
@@ -18,13 +18,11 @@ package com.android.jack.shrob;
 
 import com.android.jack.Options;
 import com.android.jack.shrob.obfuscation.NameProviderFactory;
-import com.android.jack.shrob.proguard.GrammarActions;
-import com.android.jack.shrob.spec.Flags;
 import com.android.jack.test.comparator.ComparatorMapping;
 import com.android.jack.test.helper.SourceToDexComparisonTestHelper;
 import com.android.jack.test.toolchain.AbstractTestTools;
 import com.android.jack.test.toolchain.DummyToolchain;
-import com.android.jack.test.toolchain.JackApiToolchainBase;
+import com.android.jack.test.toolchain.JackApiV01Toolchain;
 
 import java.io.File;
 
@@ -39,22 +37,22 @@ public class RepackagingTest extends AbstractTest {
       @Nonnull String mappingNumber)
       throws Exception {
     File testFolder = AbstractTestTools.getTestRootDir("com.android.jack.shrob.test" + testNumber);
-    Flags flags = new Flags();
-
-    GrammarActions.parse("proguard.flags" + flagNumber, testFolder.getAbsolutePath(), flags);
-    flags.setPackageForRenamedClasses("");
     File candidateOutputMapping = AbstractTestTools.createTempFile("mapping", ".txt");
     File refFolder = new File(testFolder, "refsRepackageClasses");
     File refOutputMapping = new File(refFolder, "expected-" + flagNumber + ".txt");
-    flags.setOutputMapping(candidateOutputMapping);
-    flags.setPrintMapping(true);
 
-    JackApiToolchainBase toolchain =
-        AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class);
-    toolchain.setShrobFlags(flags);
+    JackApiV01Toolchain toolchain =
+        AbstractTestTools.getCandidateToolchain(JackApiV01Toolchain.class);
     toolchain.addProperty(NameProviderFactory.NAMEPROVIDER.getName(), "rot13");
     toolchain.addProperty(Options.METHOD_FILTER.getName(), "supported-methods");
 
+    File proguardFile = addOptionsToFlagsFile(
+        new File(testFolder, "proguard.flags" + flagNumber),
+        testFolder,
+        " -repackageclasses '' -printmapping " + candidateOutputMapping.getAbsolutePath());
+
+    toolchain.addProguardFlags(proguardFile);
+
     SourceToDexComparisonTestHelper env =
         new SourceToDexComparisonTestHelper(new File(testFolder, "jack"));