diff options
Diffstat (limited to 'src')
3 files changed, 10 insertions, 1 deletions
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 84c7da2455..79792665d5 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 @@ -987,6 +987,10 @@ public final class BlazeRuntime { } private static FileSystem fileSystemImplementation() { + if ("0".equals(System.getProperty("io.bazel.UnixFileSystem"))) { + // Ignore UnixFileSystem, to be used for bootstrapping. + return new JavaIoFileSystem(); + } // The JNI-based UnixFileSystem is faster, but on Windows it is not available. return OS.getCurrent() == OS.WINDOWS ? new JavaIoFileSystem() : new UnixFileSystem(); } diff --git a/src/main/java/com/google/devtools/build/lib/unix/ProcessUtils.java b/src/main/java/com/google/devtools/build/lib/unix/ProcessUtils.java index f1612fcc31..8fe9e35de1 100644 --- a/src/main/java/com/google/devtools/build/lib/unix/ProcessUtils.java +++ b/src/main/java/com/google/devtools/build/lib/unix/ProcessUtils.java @@ -24,7 +24,9 @@ public final class ProcessUtils { private ProcessUtils() {} static { - UnixJniLoader.loadJni(); + if (!"0".equals(System.getProperty("io.bazel.UnixFileSystem"))) { + UnixJniLoader.loadJni(); + } } /** diff --git a/src/main/java/com/google/devtools/build/lib/util/OsUtils.java b/src/main/java/com/google/devtools/build/lib/util/OsUtils.java index fee6c737ae..e633b4fd57 100644 --- a/src/main/java/com/google/devtools/build/lib/util/OsUtils.java +++ b/src/main/java/com/google/devtools/build/lib/util/OsUtils.java @@ -45,6 +45,9 @@ public final class OsUtils { } private static boolean jniLibsAvailable() { + if ("0".equals(System.getProperty("io.bazel.UnixFileSystem"))) { + return false; + } // JNI libraries work fine on Windows, but at the moment we are not using any. return OS.getCurrent() != OS.WINDOWS; } |