commit 4fa5d82b159173a0d9a10e4c6f53d2932ce99bf2
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Mar 25 19:28:09 2020 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Mar 26 08:42:29 2020 +0000
tree 743b8addd861c266957b36ee0d3187c771a52494
parent 352d1e9938378c80e0b76041695f7a9de804944d

Allow for settings threads if running with DETERMINISTIC_DEBUGGING

Change-Id: I2344456ed1f3ea60ed7a5ea05bbad8842646b768

src/main/java/com/android/tools/r8/R8Command.java

diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index fea04c7..266b607 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 package com.android.tools.r8;
 
+import static com.android.tools.r8.utils.InternalOptions.DETERMINISTIC_DEBUGGING;
+
 import com.android.tools.r8.AssertionsConfiguration.AssertionTransformation;
 import com.android.tools.r8.ProgramResource.Kind;
 import com.android.tools.r8.errors.DexFileOverflowDiagnostic;
@@ -925,8 +927,10 @@
     internal.synthesizedClassPrefix = synthesizedClassPrefix;
     internal.desugaredLibraryKeepRuleConsumer = desugaredLibraryKeepRuleConsumer;
 
-    assert internal.threadCount == ThreadUtils.NOT_SPECIFIED;
-    internal.threadCount = getThreadCount();
+    if (!DETERMINISTIC_DEBUGGING) {
+      assert internal.threadCount == ThreadUtils.NOT_SPECIFIED;
+      internal.threadCount = getThreadCount();
+    }
 
     return internal;
   }