1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java
index 40f11aaf0e..0c7d7aa318 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxActionContextProvider.java
@@ -50,15 +50,19 @@ public class SandboxActionContextProvider extends ActionContextProvider {
     switch (OS.getCurrent()) {
       case LINUX:
         if (LinuxSandboxedStrategy.isSupported(env)) {
+          boolean fullySupported = LinuxSandboxRunner.isSupported(env);
+          if (!fullySupported
+              && !buildRequest.getOptions(SandboxOptions.class).ignoreUnsupportedSandboxing) {
+            env.getReporter().handle(Event.warn(SANDBOX_NOT_SUPPORTED_MESSAGE));
+          }
           contexts.add(
               new LinuxSandboxedStrategy(
                   buildRequest,
                   env.getDirectories(),
                   backgroundWorkers,
                   verboseFailures,
-                  env.getRuntime().getProductName()));
-        } else if (!buildRequest.getOptions(SandboxOptions.class).ignoreUnsupportedSandboxing) {
-          env.getReporter().handle(Event.warn(SANDBOX_NOT_SUPPORTED_MESSAGE));
+                  env.getRuntime().getProductName(),
+                  fullySupported));
         }
         break;
       case DARWIN: