1 files changed, 11 insertions, 14 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
index e04eae3c67..7e2400da9a 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
@@ -432,20 +432,17 @@ public final class AnalysisTestUtil {
         hostConfiguration.getMiddlemanDirectory(RepositoryName.MAIN).getPath().toString(),
         "internal(host)");
 
-    if (targetConfiguration.useDynamicConfigurations()) {
-      // With dynamic configurations, the output paths that bin, genfiles, etc. refer to may
-      // or may not include the C++-contributed pieces. e.g. they may be
-      // bazel-out/gcc-X-glibc-Y-k8-fastbuild/ or they may be bazel-out/fastbuild/. This code
-      // adds support for the non-C++ case, too.
-      Map<String, String> prunedRootMap = new HashMap<>();
-      for (Map.Entry<String, String> root : rootMap.entrySet()) {
-        prunedRootMap.put(
-            OUTPUT_PATH_CPP_PREFIX_PATTERN.matcher(root.getKey()).replaceFirst(""),
-            root.getValue()
-        );
-      }
-      rootMap.putAll(prunedRootMap);
-    }
+    // The output paths that bin, genfiles, etc. refer to may or may not include the C++-contributed
+    // pieces. e.g. they may be bazel-out/gcc-X-glibc-Y-k8-fastbuild/ or they may be
+    // bazel-out/fastbuild/. This code adds support for the non-C++ case, too.
+    Map<String, String> prunedRootMap = new HashMap<>();
+    for (Map.Entry<String, String> root : rootMap.entrySet()) {
+      prunedRootMap.put(
+          OUTPUT_PATH_CPP_PREFIX_PATTERN.matcher(root.getKey()).replaceFirst(""),
+          root.getValue()
+      );
+    }
+    rootMap.putAll(prunedRootMap);
 
     Set<String> files = new LinkedHashSet<>();
     for (Artifact artifact : artifacts) {