diff options
author | 2016-06-30 12:34:39 +0000 | |
---|---|---|
committer | 2016-07-01 07:06:38 +0000 | |
commit | 282197260f2496e60e11fee1f830e74d96d4383e (patch) | |
tree | a6c044059cf46643274bc9922d86475fdc024b98 /src/main/java/com/google/devtools/build | |
parent | 4409652fb780677f8e8e431c6da5a08d9ed245f2 (diff) |
Rename the property io.bazel.UnixFileSystem to io.bazel.EnableJni because that's what it does.
In particular, it affects Windows.
--
MOS_MIGRATED_REVID=126293339
Diffstat (limited to 'src/main/java/com/google/devtools/build')
6 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index 7f0f3991aa..92d0511e54 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -986,7 +986,7 @@ genrule( "TMP=`mktemp -d /tmp/tmp.XXXXXXXXXX` && " + "mkdir $${TMP}/_embedded_binaries/ && " + "$(location :bazel/BazelServer) " + - "--jvm_flag=-Dio.bazel.UnixFileSystem=0 --batch " + + "--jvm_flag=-Dio.bazel.EnableJni=0 --batch " + "--install_base=$${TMP} --output_base=$${TMP}/output/ " + "help everything-as-html >> $@ 2>/dev/null && " + "cat $(location //site:command-line-reference-suffix.html) >> $@" diff --git a/src/main/java/com/google/devtools/build/lib/actions/LocalHostResourceManagerDarwin.java b/src/main/java/com/google/devtools/build/lib/actions/LocalHostResourceManagerDarwin.java index 1ada1bfd0c..3cde7f2e64 100644 --- a/src/main/java/com/google/devtools/build/lib/actions/LocalHostResourceManagerDarwin.java +++ b/src/main/java/com/google/devtools/build/lib/actions/LocalHostResourceManagerDarwin.java @@ -23,7 +23,7 @@ import java.io.IOException; */ public class LocalHostResourceManagerDarwin { private static final Boolean JNI_UNAVAILABLE = - "0".equals(System.getProperty("io.bazel.UnixFileSystem")); + "0".equals(System.getProperty("io.bazel.EnableJni")); private static final double EFFECTIVE_CPUS_PER_HYPERTHREADED_CPU = 0.6; private static int getLogicalCpuCount() throws IOException { 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 0a922fc4ea..f11b51a05f 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 @@ -885,7 +885,7 @@ public final class BlazeRuntime { } private static FileSystem fileSystemImplementation() { - if ("0".equals(System.getProperty("io.bazel.UnixFileSystem"))) { + if ("0".equals(System.getProperty("io.bazel.EnableJni"))) { // Ignore UnixFileSystem, to be used for bootstrapping. return OS.getCurrent() == OS.WINDOWS ? new WindowsFileSystem() : new JavaIoFileSystem(); } diff --git a/src/main/java/com/google/devtools/build/lib/unix/NativePosixSystem.java b/src/main/java/com/google/devtools/build/lib/unix/NativePosixSystem.java index 9834f24ada..987b345a91 100644 --- a/src/main/java/com/google/devtools/build/lib/unix/NativePosixSystem.java +++ b/src/main/java/com/google/devtools/build/lib/unix/NativePosixSystem.java @@ -28,7 +28,7 @@ public class NativePosixSystem { private NativePosixSystem() {} static { - if (!"0".equals(System.getProperty("io.bazel.UnixFileSystem"))) { + if (!"0".equals(System.getProperty("io.bazel.EnableJni"))) { UnixJniLoader.loadJni(); } } 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 8fe9e35de1..096a34a6ee 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,7 @@ public final class ProcessUtils { private ProcessUtils() {} static { - if (!"0".equals(System.getProperty("io.bazel.UnixFileSystem"))) { + if (!"0".equals(System.getProperty("io.bazel.EnableJni"))) { 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 6120a42bad..85c892046d 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,7 +45,7 @@ public final class OsUtils { } private static boolean jniLibsAvailable() { - return !"0".equals(System.getProperty("io.bazel.UnixFileSystem")); + return !"0".equals(System.getProperty("io.bazel.EnableJni")); } // Force JNI linking at a moment when we have 'installBase' handy, and print |