Fixed some Bazel java tests on Windows

With this change, another 5 java_test targets of Bazel passed on Windows:

//src/test/java/com/google/devtools/...
    build/lib/bazel/repository/downloader:DownloaderTests
    build/lib:graph_test
    build/lib:java-rules-tests
    build/lib:profiler-tests
    build/lib:windows_test

Already passing targets are:
//src/test/java/com/google/devtools/...
    build/android/ziputils:ziputils-tests
    build/lib:BazelDocumentationTests
    build/lib:objc-rules-tests
    build/skyframe:skyframe_base_test
    common/options:options_test

--
Change-Id: Ibb63f29615b84d6df44289c902f6d85ab6569d61
Reviewed-on: https://bazel-review.googlesource.com/#/c/3821
MOS_MIGRATED_REVID=125084737

1 files changed, 5 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/UnixJniLoader.java b/src/main/java/com/google/devtools/build/lib/UnixJniLoader.java
index 7837d880d8..5646256ec7 100644
--- a/src/main/java/com/google/devtools/build/lib/UnixJniLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/UnixJniLoader.java
@@ -14,6 +14,8 @@
 
 package com.google.devtools.build.lib;
 
+import com.google.devtools.build.lib.util.OS;
+
 import java.io.File;
 
 /**
@@ -22,7 +24,9 @@ import java.io.File;
 public class UnixJniLoader {
   public static void loadJni() {
     try {
-      System.loadLibrary("unix");
+      if (OS.getCurrent() != OS.WINDOWS) {
+        System.loadLibrary("unix");
+      }
     } catch (UnsatisfiedLinkError ex) {
       // We are probably in tests, let's try to find the library relative to where we are.
       File cwd = new File(System.getProperty("user.dir"));