Rewrite workspace creation to use a builder class.

An instance of the builder is passed to all modules, which can each add / set
things on the builder. This reduces the BlazeModule API surface, while also
being more flexible for future changes.

--
MOS_MIGRATED_REVID=126613981

2 files changed, 5 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/BUILD b/src/test/java/com/google/devtools/build/lib/buildtool/BUILD
index d18063a5ee..5cca703cff 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/BUILD
@@ -22,6 +22,7 @@ java_test(
     runtime_deps = ["//src/test/java/com/google/devtools/build/lib:test_runner"],
     deps = [
         ":testutil",
+        "//src/main/java/com/google/devtools/build/lib:build-base",
         "//src/main/java/com/google/devtools/build/lib:inmemoryfs",
         "//src/main/java/com/google/devtools/build/lib:packages-internal",
         "//src/main/java/com/google/devtools/build/lib:runtime",
diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/SubincludePreprocessorModule.java b/src/test/java/com/google/devtools/build/lib/buildtool/SubincludePreprocessorModule.java
index d19b82913d..9b6d807b29 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/SubincludePreprocessorModule.java
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/SubincludePreprocessorModule.java
@@ -13,13 +13,14 @@
 // limitations under the License.
 package com.google.devtools.build.lib.buildtool;
 
-import com.google.devtools.build.lib.packages.Preprocessor;
+import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.packages.util.SubincludePreprocessor;
 import com.google.devtools.build.lib.runtime.BlazeModule;
+import com.google.devtools.build.lib.runtime.WorkspaceBuilder;
 
 public class SubincludePreprocessorModule extends BlazeModule {
   @Override
-  public Preprocessor.Factory.Supplier getPreprocessorFactorySupplier() {
-    return new SubincludePreprocessor.FactorySupplier();
+  public void workspaceInit(BlazeDirectories directories, WorkspaceBuilder builder) {
+    builder.setPreprocessorFactorySupplier(new SubincludePreprocessor.FactorySupplier());
   }
 }