diff --git a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
index 2fc1af9..d23dd0e 100644
--- a/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
+++ b/src/main/java/com/android/tools/r8/shaking/ProguardConfigurationParser.java
@@ -149,7 +149,21 @@
       Reporter reporter,
       ProguardConfigurationParserOptions options,
       InputDependencyGraphConsumer inputDependencyConsumer) {
-    this.configurationBuilder = ProguardConfiguration.builder(dexItemFactory, reporter);
+    this(
+        dexItemFactory,
+        reporter,
+        options,
+        inputDependencyConsumer,
+        ProguardConfiguration.builder(dexItemFactory, reporter));
+  }
+
+  public ProguardConfigurationParser(
+      DexItemFactory dexItemFactory,
+      Reporter reporter,
+      ProguardConfigurationParserOptions options,
+      InputDependencyGraphConsumer inputDependencyConsumer,
+      ProguardConfiguration.Builder configurationBuilder) {
+    this.configurationBuilder = configurationBuilder;
     this.dexItemFactory = dexItemFactory;
     this.options = options;
     this.reporter = reporter;
