aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2016-06-29 11:17:18 +0000
committerGravatar Dmitry Lomov <dslomov@google.com>2016-06-29 11:56:39 +0000
commit01f2ce486362b4a9e3a6ba2f0636bc21be514850 (patch)
tree3c514de7ed9f00a4bc668224bcc04619c9ab0d16 /src
parent3165c6cbdcfea6afc2c4b045d95bf9b872ee9d62 (diff)
Make Windows bootstrapping work again by temporarily disabling JNI.
-- MOS_MIGRATED_REVID=126177747
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/google/devtools/build/lib/util/OsUtils.java10
1 files changed, 1 insertions, 9 deletions
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 16d75b074a..6120a42bad 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,15 +45,7 @@ public final class OsUtils {
}
private static boolean jniLibsAvailable() {
- if (OS.getCurrent() == OS.WINDOWS) {
- return true;
- }
-
- if ("0".equals(System.getProperty("io.bazel.UnixFileSystem"))) {
- return false;
- }
-
- return true;
+ return !"0".equals(System.getProperty("io.bazel.UnixFileSystem"));
}
// Force JNI linking at a moment when we have 'installBase' handy, and print