From e57e9a38d52b63d1baaacfadabf8f3367f5486eb Mon Sep 17 00:00:00 2001
From: nharmata <nharmata@google.com>
Date: Mon, 2 Apr 2018 15:10:24 -0700
Subject: Remove some unnecessary params.

RELNOTES: None
PiperOrigin-RevId: 191354727
---
 .../java/com/google/devtools/build/lib/packages/PackageFactory.java    | 3 +--
 src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java   | 3 +--
 src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java  | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/main/java/com/google/devtools')

diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index 25fc689d8e..0456b44512 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -62,7 +62,6 @@ import com.google.devtools.build.lib.syntax.SkylarkUtils;
 import com.google.devtools.build.lib.syntax.Statement;
 import com.google.devtools.build.lib.syntax.Type;
 import com.google.devtools.build.lib.syntax.Type.ConversionException;
-import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.UnixGlob;
@@ -362,7 +361,7 @@ public final class PackageFactory {
       return this;
     }
 
-    public abstract PackageFactory build(RuleClassProvider ruleClassProvider, FileSystem fs);
+    public abstract PackageFactory build(RuleClassProvider ruleClassProvider);
   }
 
   @VisibleForTesting
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java
index 63bd27a57d..ada8367946 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java
@@ -270,8 +270,7 @@ public abstract class BlazeModule {
    * does not provide any helper, it should return null. Note that only one helper per Bazel/Blaze
    * runtime is allowed.
    */
-  public Package.Builder.Helper getPackageBuilderHelper(RuleClassProvider ruleClassProvider,
-      FileSystem fs) {
+  public Package.Builder.Helper getPackageBuilderHelper(RuleClassProvider ruleClassProvider) {
     return null;
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index 1ce0ac13a4..04d08f3e79 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -1282,8 +1282,7 @@ public final class BlazeRuntime {
 
       Package.Builder.Helper packageBuilderHelper = null;
       for (BlazeModule module : blazeModules) {
-        Package.Builder.Helper candidateHelper =
-            module.getPackageBuilderHelper(ruleClassProvider, fileSystem);
+        Package.Builder.Helper candidateHelper = module.getPackageBuilderHelper(ruleClassProvider);
         if (candidateHelper != null) {
           Preconditions.checkState(packageBuilderHelper == null,
               "more than one module defines a package builder helper");
-- 
cgit v1.2.3