Update logic for --nobuild_runfile_manifests allowance in RunCommand.

PiperOrigin-RevId: 750989674
Change-Id: I1a51017fb5e24fab34d968855a6906872312aabf

Author: Googler

src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java

@@ -455,9 +455,12 @@ private static BuiltTargets getBuiltTargets(
       configuration = result.getBuildConfiguration();
     }
 
-    // When virtual paths are enabled, assume runfiles staging is handled elsewhere.
+    // When --nobuild_runfile_manifests is enabled, either virtual roots are also enabled (in which
+    // case we assume runfiles staging is handled elsewhere) or the output service is responsible
+    // for staging runfiles.
     if (!configuration.buildRunfileManifests()
-        && env.getDirectories().getVirtualSourceRoot() == null) {
+        && env.getDirectories().getVirtualSourceRoot() == null
+        && !env.getOutputService().stagesTopLevelRunfiles()) {
       throw new RunCommandException(
           reportAndCreateFailureResult(
               env,
@@ -945,8 +948,10 @@ private static Path ensureRunfilesBuilt(
       workingDir = workingDir.getRelative(runfilesSupport.getRunfiles().getPrefix());
     }
 
-    // When virtual paths are enabled, assume runfiles staging is handled elsewhere.
-    if (env.getDirectories().getVirtualSourceRoot() != null) {
+    // Return early if runfiles staging is handled elsewhere (i.e. either if virtual roots are
+    // enabled or if it's managed by the output service).
+    if (env.getDirectories().getVirtualSourceRoot() != null
+        || env.getOutputService().stagesTopLevelRunfiles()) {
       return workingDir.devirtualize();
     }
 

src/main/java/com/google/devtools/build/lib/vfs/OutputService.java

@@ -264,4 +264,8 @@ default BulkDeleter bulkDeleter() {
   default XattrProvider getXattrProvider(XattrProvider delegate) {
     return delegate;
   }
+
+  default boolean stagesTopLevelRunfiles() {
+    return false;
+  }
 }