commit ea91700de51d4d36bf39eeb025da2b052c3d4072
author Googler <noreply@google.com> Tue Mar 19 13:34:09 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 19 13:35:36 2019 -0700
tree ab6ca814295708c95afad442701912727e033c12
parent c689bf93917ad0efa8100b3a0fe1b43f1f1a1cdf

Remove relativeOutputPath parameter from getFileSystem.

PiperOrigin-RevId: 239257913

src/main/java/com/google/devtools/build/lib/runtime/BazelFileSystemModule.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BazelFileSystemModule.java b/src/main/java/com/google/devtools/build/lib/runtime/BazelFileSystemModule.java
index 15fadfd..ef23dc7 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BazelFileSystemModule.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BazelFileSystemModule.java
@@ -63,7 +63,7 @@
 
   @Override
   public ModuleFileSystem getFileSystem(
-      OptionsParsingResult startupOptions, PathFragment realExecRootBase, String relativeOutputPath)
+      OptionsParsingResult startupOptions, PathFragment realExecRootBase)
       throws DefaultHashFunctionNotSetException {
     if ("0".equals(System.getProperty("io.bazel.EnableJni"))) {
       // Ignore UnixFileSystem, to be used for bootstrapping.

src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java

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 99f881b..dda1465 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
@@ -84,10 +84,9 @@
    *
    * @param startupOptions the server's startup options
    * @param realExecRootBase absolute path fragment of the actual, underlying execution root
-   * @param relativeOutputPath output path relative to the execution root
    */
   public ModuleFileSystem getFileSystem(
-      OptionsParsingResult startupOptions, PathFragment realExecRootBase, String relativeOutputPath)
+      OptionsParsingResult startupOptions, PathFragment realExecRootBase)
       throws AbruptExitException, DefaultHashFunctionNotSetException {
     return null;
   }

src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java

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 9e9d1ae..a9afc56 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
@@ -1157,10 +1157,7 @@
     try {
       for (BlazeModule module : blazeModules) {
         BlazeModule.ModuleFileSystem moduleFs =
-            module.getFileSystem(
-                options,
-                outputBase.getRelative(ServerDirectories.EXECROOT),
-                BlazeDirectories.getRelativeOutputPath(productName));
+            module.getFileSystem(options, outputBase.getRelative(ServerDirectories.EXECROOT));
         if (moduleFs != null) {
           execRootBasePath = moduleFs.virtualExecRootBase();
           Preconditions.checkState(fs == null, "more than one module returns a file system");